Merge pull request #504 from minrk/drop-py2

Require Python 3.5

.travis.yml

@@ -1,10 +1,9 @@
 language: python
 python:
+  - 3.8
   - 3.7
   - 3.6
   - 3.5
-  - 3.4
-  - 2.7
 sudo: false
 dist: xenial
 services:

appveyor.yml

@@ -9,10 +9,6 @@ environment:
       PYTHON_VERSION: "3.5.x"
       PYTHON_MAJOR: 3
       PYTHON_ARCH: "64"
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_MAJOR: 2
-      PYTHON_ARCH: "32"
 
 # build cache to preserve files/folders between builds
 cache:

nbdime/_version.py

@@ -1,2 +1,2 @@
-version_info = (1, 1, 0, 'dev')
+version_info = (2, 0, 0, 'dev')
 __version__ = ".".join(map(str, version_info))

setup.py

@@ -6,9 +6,7 @@
 
 from __future__ import print_function
 
-import io
 import os
-import sys
 from glob import glob
 
 from setuptools import setup, find_packages
@@ -90,19 +88,17 @@
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Framework :: Jupyter',
     ],
 )
 
 
-setuptools_args = {}
-install_requires = setuptools_args['install_requires'] = [
+install_requires = setup_args['install_requires'] = [
     'nbformat',
     'six',
     'colorama',
@@ -114,7 +110,7 @@
     'jinja2>=2.9',
 ]
 
-extras_require = setuptools_args['extras_require'] = {
+extras_require = setup_args['extras_require'] = {
     'test': [
         'pytest>=3.6',
         'pytest-cov',
@@ -130,40 +126,28 @@
         'recommonmark',
         'sphinx_rtd_theme'
     ],
-
-    ':python_version == "2.7"': [
-        'backports.shutil_which',
-        'backports.functools_lru_cache',
-    ],
 }
 
-setuptools_args['python_requires'] = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*'
-
-if 'setuptools' in sys.modules:
-    setup_args.update(setuptools_args)
-
-    # force entrypoints with setuptools (needed for Windows, unconditional because of wheels)
-    setup_args['entry_points'] = {
-        'console_scripts': [
-            'nbdime = nbdime.__main__:main_dispatch',
-            'nbshow = nbdime.nbshowapp:main',
-            'nbdiff = nbdime.nbdiffapp:main',
-            'nbdiff-web = nbdime.webapp.nbdiffweb:main',
-            'nbmerge = nbdime.nbmergeapp:main',
-            'nbmerge-web = nbdime.webapp.nbmergeweb:main',
-            'git-nbdiffdriver = nbdime.vcs.git.diffdriver:main',
-            'git-nbdifftool = nbdime.vcs.git.difftool:main',
-            'git-nbmergedriver = nbdime.vcs.git.mergedriver:main',
-            'git-nbmergetool = nbdime.vcs.git.mergetool:main',
-            'hg-nbdiff = nbdime.vcs.hg.diff:main',
-            'hg-nbdiffweb = nbdime.vcs.hg.diffweb:main',
-            'hg-nbmerge = nbdime.vcs.hg.merge:main',
-            'hg-nbmergeweb = nbdime.vcs.hg.mergeweb:main',
-        ]
-    }
-    setup_args.pop('scripts', None)
-
-    setup_args.update(setuptools_args)
+setup_args['python_requires'] = '>=3.5'
+
+setup_args['entry_points'] = {
+    'console_scripts': [
+        'nbdime = nbdime.__main__:main_dispatch',
+        'nbshow = nbdime.nbshowapp:main',
+        'nbdiff = nbdime.nbdiffapp:main',
+        'nbdiff-web = nbdime.webapp.nbdiffweb:main',
+        'nbmerge = nbdime.nbmergeapp:main',
+        'nbmerge-web = nbdime.webapp.nbmergeweb:main',
+        'git-nbdiffdriver = nbdime.vcs.git.diffdriver:main',
+        'git-nbdifftool = nbdime.vcs.git.difftool:main',
+        'git-nbmergedriver = nbdime.vcs.git.mergedriver:main',
+        'git-nbmergetool = nbdime.vcs.git.mergetool:main',
+        'hg-nbdiff = nbdime.vcs.hg.diff:main',
+        'hg-nbdiffweb = nbdime.vcs.hg.diffweb:main',
+        'hg-nbmerge = nbdime.vcs.hg.merge:main',
+        'hg-nbmergeweb = nbdime.vcs.hg.mergeweb:main',
+    ]
+}
 
 if __name__ == '__main__':
     setup(**setup_args)