Skip to content

Commit

Permalink
DEP: Bump Cython to 0.29.13 (pandas-dev#28391)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAugspurger committed Sep 12, 2019
1 parent 760c654 commit 07e7191
Show file tree
Hide file tree
Showing 16 changed files with 25 additions and 22 deletions.
4 changes: 2 additions & 2 deletions ci/deps/azure-35-compat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ dependencies:
- xlsxwriter=0.9.8
- xlwt=1.2.0
# universal
- cython=0.28.2
- hypothesis>=3.58.0
- pytest-xdist
- pytest-mock
- pytest-azurepipelines
- pip
- pip:
# for python 3.5, pytest>=4.0.2 is not available in conda
# for python 3.5, pytest>=4.0.2, cython>=0.29.13 is not available in conda
- cython>=0.29.13
- pytest==4.5.0
- html5lib==1.0b2
4 changes: 3 additions & 1 deletion ci/deps/azure-36-32bit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ dependencies:
- gcc_linux-32
- gcc_linux-32
- gxx_linux-32
- cython=0.28.2
- numpy=1.14.*
- python-dateutil
- python=3.6.*
Expand All @@ -18,3 +17,6 @@ dependencies:
- pytest-azurepipelines
- hypothesis>=3.58.0
- pip
- pip:
# Anaconda doesn't build a new enough Cython
- cython>=0.29.13
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- beautifulsoup4==4.6.0
- bottleneck=1.2.*
- cython=0.28.2
- cython=0.29.13
- lxml
- matplotlib=2.2.2
- numpy=1.14.*
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-36-locale_slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- gcsfs
- html5lib
- ipython
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- html5lib
- ipython
- jinja2
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/azure-37-numpydev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
- python=3.7.*
- pytz
- Cython>=0.28.2
- Cython>=0.29.13
# universal
- pytest>=4.0.2
- pytest-xdist
Expand Down
4 changes: 2 additions & 2 deletions ci/deps/azure-macos-35.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
dependencies:
- beautifulsoup4
- bottleneck
- cython>=0.28.2
- html5lib
- jinja2
- lxml
Expand All @@ -23,6 +22,8 @@ dependencies:
- xlsxwriter
- xlwt
- pip:
# Anaconda / conda-forge don't build for 3.5
- cython>=0.29.13
- pyreadstat
# universal
- pytest==4.5.0
Expand All @@ -31,4 +32,3 @@ dependencies:
- hypothesis>=3.58.0
# https://github.com/pandas-dev/pandas/issues/27421
- pytest-azurepipelines<1.0.0

6 changes: 3 additions & 3 deletions ci/deps/azure-windows-36.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ dependencies:
- xlsxwriter
- xlwt
# universal
- cython>=0.28.2
- pytest>=4.0.2
- pytest-xdist
- cython>=0.29.13
- pytest>=5.0.1
- pytest-xdist>=1.29.0
- pytest-mock
- pytest-azurepipelines
- hypothesis>=3.58.0
6 changes: 3 additions & 3 deletions ci/deps/azure-windows-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies:
- xlsxwriter
- xlwt
# universal
- cython>=0.28.2
- pytest>=4.0.2
- pytest-xdist
- cython>=0.29.13
- pytest>=5.0.0
- pytest-xdist>=1.29.0
- pytest-mock
- pytest-azurepipelines
- hypothesis>=3.58.0
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-cov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- beautifulsoup4
- botocore>=1.11
- cython>=0.28.2
- cython>=0.29.13
- dask
- fastparquet>=0.2.1
- gcsfs
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-locale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
- beautifulsoup4
- blosc=1.14.3
- python-blosc
- cython>=0.28.2
- cython>=0.29.13
- fastparquet=0.2.1
- gcsfs=0.2.2
- html5lib
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-36-slow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- conda-forge
dependencies:
- beautifulsoup4
- cython>=0.28.2
- cython>=0.29.13
- html5lib
- lxml
- matplotlib
Expand Down
2 changes: 1 addition & 1 deletion ci/deps/travis-37.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ channels:
dependencies:
- python=3.7.*
- botocore>=1.11
- cython>=0.28.2
- cython>=0.29.13
- numpy
- python-dateutil
- nomkl
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- asv

# building
- cython>=0.28.2
- cython>=0.29.13

# code checks
- black
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ numpy>=1.15
python-dateutil>=2.6.1
pytz
asv
cython>=0.28.2
cython>=0.29.13
black
cpplint
flake8
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ def is_platform_mac():


min_numpy_ver = "1.13.3"
min_cython_ver = "0.29.13"

setuptools_kwargs = {
"install_requires": [
"python-dateutil >= 2.6.1",
Expand All @@ -43,7 +45,6 @@ def is_platform_mac():
}


min_cython_ver = "0.28.2"
try:
import Cython

Expand Down

0 comments on commit 07e7191

Please sign in to comment.