Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upper-cap setuptools and remove support for Python 2.7-3.6 #137

Merged
merged 3 commits into from
Sep 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
30 changes: 2 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 0 additions & 3 deletions docs/examples/ddaspk/planarpendulum_ddaspk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions docs/examples/doublependulum.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions docs/examples/planarpendulum.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions docs/examples/slidingpendulum.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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"]