Skip to content

Commit ad7e583

Browse files
authored
Merge pull request #452 from grlee77/rtd_cython_fix
bump minimum supported Cython version
2 parents e404a1e + 288ccb3 commit ad7e583

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,29 @@ matrix:
1616
env:
1717
- NUMPYSPEC=numpy
1818
- MATPLOTLIBSPEC=matplotlib
19+
- CYTHONSPEC=cython
1920
- USE_WHEEL=1
2021
- os: linux
2122
python: 3.7-dev
2223
env:
2324
- NUMPYSPEC=numpy
2425
- MATPLOTLIBSPEC=matplotlib
26+
- CYTHONSPEC=cython
2527
- USE_SDIST=1
2628
- os: linux
2729
python: 3.5
2830
env:
2931
- NUMPYSPEC="numpy==1.13.3"
3032
- MATPLOTLIBSPEC=matplotlib
33+
- CYTHONSPEC="cython==0.23.5"
3134
- REFGUIDE_CHECK=1 # run doctests only
3235
- os: osx
3336
osx_image: xcode7.3
3437
language: objective-c
3538
env:
3639
- NUMPYSPEC=numpy
3740
- MATPLOTLIBSPEC=matplotlib
41+
- CYTHONSPEC=cython
3842
- TRAVIS_PYTHON_VERSION=3.5
3943

4044
cache: pip
@@ -51,7 +55,8 @@ before_install:
5155
# Set numpy version first, other packages link against it
5256
- pip install $NUMPYSPEC
5357
- pip install $MATPLOTLIBSPEC
54-
- pip install Cython nose coverage codecov futures
58+
- pip install $CYTHONSPEC
59+
- pip install nose coverage codecov futures
5560
- set -o pipefail
5661
- if [ "${USE_WHEEL}" == "1" ]; then pip install wheel; fi
5762
- |

doc/source/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The requirements needed to build from source are:
4040

4141
- Python_ 2.7 or >=3.4
4242
- Numpy_ >= 1.13.3
43-
- Cython_ >= 0.20.2 (if installing from git, not from a PyPI source release)
43+
- Cython_ >= 0.23.5 (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
4646
Matplotlib_ package.

util/readthedocs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
numpy
2-
Cython==0.20.2
2+
cython
33
nose
44
wheel
55
numpydoc

0 commit comments

Comments
 (0)