"python setup.py sdist bdist_wheel" runs correctly.

TO DO: check that the resulting distribution installs correctly.

Author: lebigot

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2018, Eric O. LEBIGOT (EOL).
+Copyright (c) 2010-2020, Eric O. LEBIGOT (EOL).
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

setup.py

@@ -6,39 +6,17 @@
 import os
 import sys
 
-min_version = (2, 3)
+# setuptools has python_requires, but distutils doesn't, so we test the
+# Python version manually:
+min_version = (2, 7)
 error_msg = ("Sorry, this package is for Python %d.%d and higher only." %
              min_version)
-
 try:
     if sys.version_info < min_version:
         sys.exit(error_msg)
 except AttributeError:  # sys.version_info was introduced in Python 2.0
     sys.exit(error_msg)
 
-# Determination of the directory that contains the source code:
-if os.path.exists('uncertainties'):
-    # Case of a direct download of a Python-version-specific Git
-    # branch:
-    package_dir = 'uncertainties'
-else:
-    # Case of a PyPI package download:
-    if sys.version_info >= (2, 7):
-        package_dir = 'uncertainties-py27'
-    else:
-        package_dir = 'uncertainties-py23'
-
-#! The following code was intended to automatically fetch the version
-# number; however, it fails when run from Python3 if the downloaded
-# code is not the Python 3 version.  An alternative approach would be
-# to run 2to3 just before, instead of using build_py_2to3 (which does
-# not modify the source), but care should be taken so that users can
-# run the setup.py script many times anyway.
-## Access to the local uncertainties package (and not to an already
-## installed uncertainties package):
-# sys.path.insert(0, package_dir)
-# uncertainties = __import__(package_dir)
-
 # Common options for distutils/setuptools's setup():
 setup_options = dict(
     name='uncertainties',
@@ -157,6 +135,7 @@
 
 Main changes:
 
+- 3.1.4: Python 2.7+ is now required.
 - 3.1.2: Fix for NumPy 1.17 and ``unumpy.ulinalg.pinv()``.
 - 3.1: Variables built through a correlation or covariance matrix, and that
   have uncertainties that span many orders of magnitude are now
@@ -293,11 +272,6 @@
 .. _main website: http://uncertainties-python-package.readthedocs.io/
 .. _code updater: http://uncertainties-python-package.readthedocs.io/en/latest/index.html#migration-from-version-1-to-version-2
 .. _formatting: http://uncertainties-python-package.readthedocs.io/en/latest/user_guide.html#printing''',
-    keywords=[
-        'error propagation', 'uncertainties', 'uncertainty calculations',
-        'standard deviation', 'derivatives', 'partial derivatives',
-        'differentiation'
-    ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -307,10 +281,6 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.3',
-        'Programming Language :: Python :: 2.4',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         # Python 3.1 failed because of a problem with NumPy 1.6.1 (whereas
@@ -334,8 +304,11 @@
         'Topic :: Utilities'
     ],
 
-    # Where to find the source code:
-    package_dir={'uncertainties': package_dir},
+    keywords=[
+        'error propagation', 'uncertainties', 'uncertainty calculations',
+        'standard deviation', 'derivatives', 'partial derivatives',
+        'differentiation'
+    ],
 
     # Files are defined in MANIFEST (which is automatically created by
     # python setup.py sdist bdist_wheel):
@@ -344,7 +317,7 @@
         'uncertainties.lib1to2.fixes'
     ],
 
-    # Wheels are built for both Python 2 and Python 3:
+    # The code runs with both Python 2 and Python 3:
     options={"bdist_wheel": {"universal": True}}
     )
 
@@ -355,17 +328,25 @@
 
     # Some setuptools-specific options can be added:
 
-    addtl_setup_options = {
+    addtl_setup_options = dict(
 
-        'install_requires': ['future'],
-        'tests_require': ['nose', 'numpy'],
+        project_urls={
+            'Documentation':
+                'https://uncertainties-python-package.readthedocs.io/',
+            'Source': 'https://github.com/lebigot/uncertainties'
+        },
+
+        install_requires=['future'],
+
+        tests_require=['nose', 'numpy'],
+        
         # Optional dependencies install using:
         # `easy_install uncertainties[optional]`
-        'extras_require': {
+        extras_require={
             'optional': ['numpy'],
             'docs': ['sphinx'],
         }
-    }
+    )
 
     # easy_install uncertainties[tests] option:
     addtl_setup_options['extras_require']['tests'] = (
@@ -381,13 +362,6 @@
 except ImportError:
     from distutils.core import setup
 
-    # distutils.core.setup is not like setuptools: it does not have an
-    # option for automatically calling 2to3 if Python 3 is used, so the
-    # conversion is done here:
-    if sys.version_info >= (3,):
-        import subprocess
-        subprocess.check_call(["2to3", "-w", "."])
-
 # End of setup definition
 
 setup(**setup_options)