Merge pull request #137 from Saransh-cpp/pin-setuptools

Upper-cap `setuptools` and remove support for Python `2.7`-`3.6`

.github/workflows/tests.yml

@@ -10,21 +10,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: 2.7
-            sundials-version: 5.7.0
-            tox-env: py27
-            sundials-precision: double
-            sundials-index-size: 64
-          - python-version: 3.5
-            sundials-version: 5.7.0
-            tox-env: py35
-            sundials-precision: double
-            sundials-index-size: 64
-          - python-version: 3.6
-            sundials-version: 5.7.0
-            tox-env: py36
-            sundials-precision: double
-            sundials-index-size: 64
           - python-version: 3.7
             sundials-version: 5.7.0
             tox-env: py37
@@ -117,7 +102,8 @@ jobs:
 
     - name: Install python dependencies
       run: |
-        python -m pip install --upgrade pip setuptools
+        python -m pip install --upgrade pip
+        python -m pip install "setuptools<=64.0.0"
         python -m pip install --upgrade tox
 
     - name: Run tests

.travis.yml

@@ -22,17 +22,6 @@ cache:
 matrix:
   include:
     # needed to work around https://github.com/travis-ci/travis-ci/issues/4794
-    - python: 2.7
-      env:
-      - TOXENV=py27 SUNDIALS_VERSION='5.7.0'
-    - python: 3.5
-      dist: trusty
-      env:
-      - TOXENV=py35 SUNDIALS_VERSION='5.7.0'
-    - python: 3.6
-      dist: trusty
-      env:
-      - TOXENV=py36 SUNDIALS_VERSION='5.7.0'
     - python: 3.7
       env:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0'
@@ -53,27 +42,14 @@ matrix:
       - TOXENV=checkreadme SUNDIALS_VERSION='5.7.0'
 
     # Reduced Index Size - this allows use of lapack linsolvers - default is -64
-    - python: 2.7
-      env:
-      - TOXENV=py27 SUNDIALS_VERSION='5.7.0' SUNDIALS_INDEX_SIZE='32'
     - python: 3.7
       env:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0' SUNDIALS_INDEX_SIZE='32'
 
     # Additional precisions - default is 'double'
-    - python: 2.7
-      env:
-      - TOXENV=py27 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='single'
     - python: 3.7
       env:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='single'
-    - python: 2.7
-      env:
-      - TOXENV=py27 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='extended'
-    - python: 3.6
-      dist: trusty
-      env:
-      - TOXENV=py36 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='extended' SUNDIALS_INDEX_SIZE='64'
     - python: 3.7
       env:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='extended' SUNDIALS_INDEX_SIZE='64'
@@ -82,16 +58,14 @@ matrix:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='extended' SUNDIALS_INDEX_SIZE='64'
 
   allow_failures:
-    - python: 2.7
-      env:
-      - TOXENV=py27 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='single'
     - python: 3.7
       env:
       - TOXENV=py37 SUNDIALS_VERSION='5.7.0' SUNDIALS_PRECISION='single'
 
 install:
   - source ci_support/ensure_sundials_installed.sh
-  - pip install -U pip setuptools virtualenv wheel
+  - pip install -U pip virtualenv wheel
+  - pip install "setuptools<=64.0.0"
   - pip install -U tox-travis
 
 script:

README.md

@@ -13,7 +13,7 @@
 [![Paper DOI](http://joss.theoj.org/papers/10.21105/joss.00165/status.svg)](https://doi.org/10.21105/joss.00165)
 
 
-ODES is a scikit for Python 2.7 and 3.3-3.5 offering extra ode/dae solvers, as an extension to what is available in scipy.
+ODES is a scikit for Python 3.6-3.9 offering extra ode/dae solvers, as an extension to what is available in scipy.
 The documentation is available at [Read The Docs](https://scikits-odes.readthedocs.io/), and API docs can be found at https://bmcage.github.io/odes.
 
 # Available solvers:

common.py

@@ -33,11 +33,8 @@
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: BSD License',
         'Topic :: Scientific/Engineering',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
+        "Programming Language :: Python :: 3 :: Only",
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

docs/examples/ddaspk/planarpendulum_ddaspk.py

@@ -37,9 +37,6 @@
 then it solves the problme at hand. We take g=1, m=1
 
 """
-#python 2.7 support
-from __future__ import print_function, division
-
 from numpy import (arange, zeros, array, sin, empty)
 from scikits.odes import dae
 import pylab

docs/examples/doublependulum.py

@@ -55,8 +55,6 @@
 installed. The animation is stored in the directory anidoublependulum.
 
 """
-#python 2.7 support
-from __future__ import print_function, division
 try:
     input = raw_input
 except:

docs/examples/planarpendulum.py

@@ -37,8 +37,6 @@
 then it solves the problme at hand. We take g=1, m=1
 
 """
-#python 2.7 support
-from __future__ import print_function, division
 try:
     input = raw_input
 except:

docs/examples/slidingpendulum.py

@@ -32,8 +32,6 @@
 where the last constraint comes from deriving the equation of the curve on
 which the pendulum slides
 """
-#python 2.7 support
-from __future__ import print_function, division
 try:
     input = raw_input
 except:

pyproject.toml

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["setuptools", "wheel", "numpy", "cython<3.0.0a8"]
+requires = ["setuptools<=64.0.0", "wheel", "numpy", "cython<3.0.0a8"]