Merge pull request #607 from kr0p07k1n/python_310

Support python 3.10

.github/workflows/tests.yml

@@ -79,7 +79,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

setup.py

@@ -16,15 +16,12 @@
 sys.path.append(os.path.dirname(__file__))
 
 from setupbase import (create_cmdclass, install_npm, ensure_targets,
-    combine_commands, ensure_python, get_version)
+    combine_commands, get_version)
 
 pjoin = os.path.join
 here = os.path.abspath(os.path.dirname(__file__))
 
 
-# Minimal Python version sanity check
-ensure_python('>=3.6')
-
 # the name of the project
 name = 'nbdime'
 version = get_version(pjoin(name, '_version.py'))
@@ -112,8 +109,10 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Framework :: Jupyter',
     ],
+    python_requires = '>=3.6',
 )
 
 
@@ -149,8 +148,6 @@
     ],
 }
 
-setup_args['python_requires'] = '>=3.6'
-
 setup_args['entry_points'] = {
     'console_scripts': [
         'nbdime = nbdime.__main__:main_dispatch',

setupbase.py

@@ -91,24 +91,6 @@ def get_version(file, name='__version__'):
     return version_ns[name]
 
 
-def ensure_python(specs):
-    """Given a list of range specifiers for python, ensure compatibility.
-    """
-    if not isinstance(specs, (list, tuple)):
-        specs = [specs]
-    v = sys.version_info
-    part = '%s.%s' % (v.major, v.minor)
-    for spec in specs:
-        if part == spec:
-            return
-        try:
-            if eval(part + spec):
-                return
-        except SyntaxError:
-            pass
-    raise ValueError('Python version %s unsupported' % part)
-
-
 def find_packages(top=HERE):
     """
     Find all of the packages.