Skip to content

Commit 6116b29

Browse files
authored
Merge pull request #434 from grlee77/drop_python2_from_CI
Drop Python 2.7 testing on CI and update docs for Python 3.5+ support.
2 parents fea80fd + af2bede commit 6116b29

8 files changed

Lines changed: 13 additions & 37 deletions

File tree

.travis.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,6 @@ env:
1111

1212
matrix:
1313
include:
14-
- os: linux
15-
python: 2.7
16-
env:
17-
- PYFLAKES=1
18-
- PEP8=1
19-
- NUMPYSPEC=numpy
20-
- MATPLOTLIBSPEC=matplotlib
21-
before_install:
22-
- pip install pep8==1.5.1
23-
- pip install pyflakes
24-
script:
25-
- PYFLAKES_NODOCTEST=1 pyflakes pywt demo | grep -E -v 'unable to detect undefined names|assigned to but never used|imported but unused|redefinition of unused' > test.out; cat test.out; test \! -s test.out
26-
- pep8 pywt demo
2714
- os: linux
2815
python: 3.6
2916
env:
@@ -36,15 +23,10 @@ matrix:
3623
- NUMPYSPEC=numpy
3724
- MATPLOTLIBSPEC=matplotlib
3825
- USE_SDIST=1
39-
- os: linux
40-
python: 2.7
41-
env:
42-
- NUMPYSPEC="numpy==1.9.3"
43-
- MATPLOTLIBSPEC="matplotlib<=2.2.2" # 2.2.3 requires numpy >= 1.10
4426
- os: linux
4527
python: 3.5
4628
env:
47-
- NUMPYSPEC=numpy
29+
- NUMPYSPEC="numpy==1.13.3"
4830
- MATPLOTLIBSPEC=matplotlib
4931
- REFGUIDE_CHECK=1 # run doctests only
5032
- os: osx

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ For more usage examples see the `demo`_ directory in the source package.
6565
Installation
6666
------------
6767

68-
PyWavelets supports `Python`_ 2.7 or >=3.4, and is only dependent on `Numpy`_
69-
(supported versions are currently ``>= 1.9``). To pass all of the tests,
68+
PyWavelets supports `Python`_ >=3.5, and is only dependent on `Numpy`_
69+
(supported versions are currently ``>= 1.13.3``). To pass all of the tests,
7070
`Matplotlib`_ is also required.
7171

7272
There are binary wheels for Intel Linux, Windows and macOS / OSX on PyPi. If

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
environment:
99
matrix:
10-
- PYTHON: "C:\\Python27"
11-
- PYTHON: "C:\\Python27-x64"
1210
- PYTHON: "C:\\Python34"
1311
- PYTHON: "C:\\Python34-x64"
1412
DISTUTILS_USE_SDK: "1"

doc/source/dev/preparing_windows_build_environment.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ Depending on your Python version, a different version of the Microsoft Visual
1414
C++ compiler will be required to build extensions. The same compiler that was
1515
used to build Python itself should be used.
1616

17-
For official binary builds of Python 2.6 to 3.2, this will be VS 2008. Python
18-
3.3 and 3.4 were compiled with VS 2010, and for Python 3.5 it will be MSVC 2015.
17+
For Python 3.5, 3.6 and 3.7 it will be MSVC 2015.
1918

2019
The MSVC version should be printed when starting a Python REPL, and can be
2120
checked against the note below:
@@ -31,9 +30,7 @@ checked against the note below:
3130

3231
::
3332

34-
Python 2.7.3 (default, Apr 10 2012, 23:31:26) [MSC v.1500 32 bit (Intel)] on win32
35-
Python 3.2 (r32:88445, Feb 20 2011, 21:30:00) [MSC v.1500 64 bit (AMD64)] on win32
36-
33+
Python 3.5.5 (default, Feb 13 2018, 06:15:35) [MSC v.1900 64 bit (AMD64)] on win32
3734

3835
To get started first download, extract and install *Microsoft Windows SDK for
3936
Windows 7 and .NET Framework 3.5 SP1* from

doc/source/dev/testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ Running tests with Tox
3636
----------------------
3737

3838
There's also a config file for running tests with `Tox`_ (``pip install tox``).
39-
To for example run tests for Python 2.7 and Python 3.4 use::
39+
To for example run tests for Python 3.5 and 3.6 use::
4040

41-
tox -e py27,py34
41+
tox -e py35,py36
4242

4343
For more information see the `Tox`_ documentation.
4444

doc/source/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ PyWavelets source code directory (containing ``setup.py``) and type::
3939
The requirements needed to build from source are:
4040

4141
- Python_ 2.7 or >=3.4
42-
- Numpy_ >= 1.9.1
42+
- Numpy_ >= 1.13.3
4343
- Cython_ >= 0.20.2 (if installing from git, not from a PyPI source release)
4444

4545
To run all the tests for PyWavelets, you will also need to install the

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,6 @@ def setup_package():
398398
"Programming Language :: C",
399399
"Programming Language :: Python",
400400
"Programming Language :: Python :: 3",
401-
"Programming Language :: Python :: 2.7",
402401
"Programming Language :: Python :: 3.5",
403402
"Programming Language :: Python :: 3.6",
404403
"Programming Language :: Python :: 3.7",
@@ -415,8 +414,8 @@ def setup_package():
415414
cmdclass={'develop': develop_build_clib},
416415
test_suite='nose.collector',
417416

418-
install_requires=["numpy>=1.9.1"],
419-
setup_requires=["numpy>=1.9.1"],
417+
install_requires=["numpy>=1.13.3"],
418+
setup_requires=["numpy>=1.13.3"],
420419
)
421420

422421
if "--force" in sys.argv:

tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
# - Use pip to install the pywt sdist into the virtualenv
1414
# - Run the pywt tests
1515
# To run against a specific subset of Python versions, use:
16-
# tox -e py26,py27
16+
# tox -e py36,py37
1717

1818
# Tox assumes that you have appropriate Python interpreters already
19-
# installed and that they can be run as 'python2.6', 'python2.7', etc.
19+
# installed and that they can be run as 'python3.6', 'python3.7', etc.
2020

2121
[tox]
2222
toxworkdir = {homedir}/.tox/pywt/
23-
envlist = py26, py27, py33, py34, py35
23+
envlist = py35, py36, py37
2424

2525
[testenv]
2626
deps =

0 commit comments

Comments
 (0)