Skip to content

Commit

Permalink
BLD: drop Python 3.5 support. It's time (see NEP 29).
Browse files Browse the repository at this point in the history
  • Loading branch information
rgommers committed Dec 27, 2019
1 parent 4501f0f commit 033166b
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 21 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ matrix:
- NUMPYSPEC="numpy==1.15.4"
# Test SciPy with the debug version of Python.
# However travis only specifies regular or development builds of Python
# so we must install python3.5-dbg using apt.
# so we must install python3.7-dbg using apt.
- language: generic
env:
- USE_DEBUG=python3.5-dbg
- USE_DEBUG=python3.7-dbg
- TESTMODE=fast
- NUMPYSPEC="--upgrade numpy"
addons:
apt:
packages:
- *common_packages
- python3.5-dbg
- python3.5-dev
- python3.7-dbg
- python3.7-dev
- python: 3.8
env:
- TESTMODE=full
Expand All @@ -76,7 +76,7 @@ matrix:
- REFGUIDE_CHECK=1
- NUMPYSPEC="--upgrade numpy"
- ASV_CHECK=1
- python: 3.5
- python: 3.6
env:
- TESTMODE=fast
- COVERAGE=
Expand Down Expand Up @@ -186,7 +186,7 @@ before_install:
- |
if [ -n "${USE_DEBUG}" ]; then
# see gh-10676; need to pin pytest version with debug
# Python 3.5
# Python 3.7
travis_retry pip install pytest==5.0.1
fi
- travis_retry pip install gmpy2 # speeds up mpmath (scipy.special tests)
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ PREREQUISITES

SciPy requires the following software installed for your platform:

1) Python__ >= 3.5
1) Python__ >= 3.6

__ https://www.python.org

Expand Down
8 changes: 1 addition & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ jobs:
TEST_MODE: full
OPENBLAS: $(OPENBLAS_32)
BITS: 32
Python35-64bit-full:
PYTHON_VERSION: '3.5'
PYTHON_ARCH: 'x64'
TEST_MODE: full
OPENBLAS: $(OPENBLAS_64)
BITS: 64
Python36-64bit-full:
PYTHON_VERSION: '3.6'
PYTHON_ARCH: 'x64'
Expand Down Expand Up @@ -115,7 +109,7 @@ jobs:
- script: python -m pip install numpy cython==0.29.14 pybind11 pytest pytest-timeout pytest-xdist pytest-env pytest-cov Pillow mpmath
displayName: 'Install dependencies'
- powershell: |
If ($(PYTHON_VERSION) -ne '3.5') {
If ($(PYTHON_VERSION) -ne '3.6') {
python -m pip install matplotlib==3.2.0rc1
}
else {
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ requires = [
"wheel",
"setuptools",
"Cython>=0.29.14",
"numpy==1.13.3; python_version=='3.5' and platform_system!='AIX'",
"numpy==1.13.3; python_version=='3.6' and platform_system!='AIX'",
"numpy==1.14.5; python_version=='3.7' and platform_system!='AIX'",
"numpy==1.17.3; python_version>='3.8' and platform_system!='AIX'",
"numpy==1.16.0; python_version=='3.5' and platform_system=='AIX'",
"numpy==1.16.0; python_version=='3.6' and platform_system=='AIX'",
"numpy==1.16.0; python_version=='3.7' and platform_system=='AIX'",
"numpy==1.17.3; python_version>='3.8' and platform_system=='AIX'",
Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
from distutils.version import LooseVersion


if sys.version_info[:2] < (3, 5):
raise RuntimeError("Python version >= 3.5 required.")
if sys.version_info[:2] < (3, 6):
raise RuntimeError("Python version >= 3.6 required.")

import builtins

Expand All @@ -41,9 +41,9 @@
Programming Language :: C
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Topic :: Software Development
Topic :: Scientific/Engineering
Operating System :: Microsoft :: Windows
Expand Down Expand Up @@ -494,7 +494,7 @@ def setup_package():
test_suite='nose.collector',
setup_requires=setup_requires,
install_requires=install_requires,
python_requires='>=3.5',
python_requires='>=3.6',
)

if "--force" in sys.argv:
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
# installed and that they can be run as 'python3.6', 'python3.7', etc.

[tox]
envlist = py35,py36,py37
envlist = py36,py37,py38
skipsdist=True

[testenv]
Expand Down

0 comments on commit 033166b

Please sign in to comment.