From 9c0606c3e0196e8a6398b92e26f9f529167614fd Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 10 Jul 2020 16:59:02 -0400
Subject: [PATCH 1/2] Update PyPI classifiers to remove 3.6 and add 3.9.

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index cc8738a4a752..7f08fa09d6eb 100644
--- a/setup.py
+++ b/setup.py
@@ -258,9 +258,9 @@ def build_extensions(self):
         'License :: OSI Approved :: Python Software Foundation License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Topic :: Scientific/Engineering :: Visualization',
     ],
 

From d6255f07ee59331ed3d7a5f3c412fc5a28ddb71b Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Fri, 10 Jul 2020 16:59:49 -0400
Subject: [PATCH 2/2] Remove old Python 3.6 contextlib import.

---
 lib/matplotlib/backends/backend_agg.py       | 5 +----
 lib/matplotlib/backends/backend_gtk3cairo.py | 5 +----
 lib/matplotlib/testing/decorators.py         | 7 ++-----
 lib/matplotlib/tests/test_figure.py          | 5 +----
 lib/matplotlib/tests/test_ticker.py          | 5 +----
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
index be2529d8d159..b1ef3035290d 100644
--- a/lib/matplotlib/backends/backend_agg.py
+++ b/lib/matplotlib/backends/backend_agg.py
@@ -25,10 +25,7 @@
     import threading
 except ImportError:
     import dummy_threading as threading
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py 3.6.
+from contextlib import nullcontext
 from math import radians, cos, sin
 
 import numpy as np
diff --git a/lib/matplotlib/backends/backend_gtk3cairo.py b/lib/matplotlib/backends/backend_gtk3cairo.py
index 13b4587b2f7c..92bab8d336e7 100644
--- a/lib/matplotlib/backends/backend_gtk3cairo.py
+++ b/lib/matplotlib/backends/backend_gtk3cairo.py
@@ -1,7 +1,4 @@
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py 3.6.
+from contextlib import nullcontext
 
 from . import backend_cairo, backend_gtk3
 from .backend_gtk3 import Gtk, _BackendGTK3
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
index 8ddb604730c2..b8d7e3a3f22c 100644
--- a/lib/matplotlib/testing/decorators.py
+++ b/lib/matplotlib/testing/decorators.py
@@ -9,10 +9,6 @@
 import sys
 import unittest
 import warnings
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py3.6.
 
 import matplotlib as mpl
 import matplotlib.style
@@ -219,7 +215,8 @@ def compare(self, idx, baseline, extension, *, _lock=False):
                               {'Creator': None, 'Producer': None,
                                'CreationDate': None})
 
-        lock = cbook._lock_path(actual_path) if _lock else nullcontext()
+        lock = (cbook._lock_path(actual_path)
+                if _lock else contextlib.nullcontext())
         with lock:
             fig.savefig(actual_path, **kwargs)
             expected_path = self.copy_baseline(baseline, extension)
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
index dc04a869ce7b..84e65dfa90fa 100644
--- a/lib/matplotlib/tests/test_figure.py
+++ b/lib/matplotlib/tests/test_figure.py
@@ -1,13 +1,10 @@
+from contextlib import nullcontext
 from datetime import datetime
 import io
 from pathlib import Path
 import platform
 from types import SimpleNamespace
 import warnings
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py3.6
 
 import matplotlib as mpl
 from matplotlib import cbook, rcParams
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
index 937f3306e3b9..9c75678e14d3 100644
--- a/lib/matplotlib/tests/test_ticker.py
+++ b/lib/matplotlib/tests/test_ticker.py
@@ -1,7 +1,4 @@
-try:
-    from contextlib import nullcontext
-except ImportError:
-    from contextlib import ExitStack as nullcontext  # Py 3.6.
+from contextlib import nullcontext
 import re
 import itertools