From 07e7191957e138311e2de4bdd7f02f847a49cdf3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Thu, 12 Sep 2019 07:49:22 -0500 Subject: [PATCH] DEP: Bump Cython to 0.29.13 (#28391) --- ci/deps/azure-35-compat.yaml | 4 ++-- ci/deps/azure-36-32bit.yaml | 4 +++- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/azure-macos-35.yaml | 4 ++-- ci/deps/azure-windows-36.yaml | 6 +++--- ci/deps/azure-windows-37.yaml | 6 +++--- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- setup.py | 3 ++- 16 files changed, 25 insertions(+), 22 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 97c45b2be27d7..dd54001984ec7 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -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 diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 43bf0ecdd6c3e..321cc203961d5 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -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.* @@ -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 diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 6a77b5dbedc61..76868f598f11b 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -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.* diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2bf2bd74795d2..21205375204dc 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - beautifulsoup4 - - cython>=0.28.2 + - cython>=0.29.13 - gcsfs - html5lib - ipython diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 05adbf0c924dc..b8daf8ead5dfc 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - beautifulsoup4 - - cython>=0.28.2 + - cython>=0.29.13 - html5lib - ipython - jinja2 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 5cf897c98da10..cb2cb5c7a0188 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -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 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 98859b596ab2a..4a46b3f4b99d0 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -4,7 +4,6 @@ channels: dependencies: - beautifulsoup4 - bottleneck - - cython>=0.28.2 - html5lib - jinja2 - lxml @@ -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 @@ -31,4 +32,3 @@ dependencies: - hypothesis>=3.58.0 # https://github.com/pandas-dev/pandas/issues/27421 - pytest-azurepipelines<1.0.0 - diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index b0f3f5389ac85..33c8122fb232a 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -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 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 08208d1e2d59a..7680ed9fd9c92 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -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 diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 6f85c32b9a915..48e9e3b6896f3 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -5,7 +5,7 @@ channels: dependencies: - beautifulsoup4 - botocore>=1.11 - - cython>=0.28.2 + - cython>=0.29.13 - dask - fastparquet>=0.2.1 - gcsfs diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 7da4abb9283df..44795766d7c31 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -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 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index 9564bf5bb3a9f..e9c5dadbc924a 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -4,7 +4,7 @@ channels: - conda-forge dependencies: - beautifulsoup4 - - cython>=0.28.2 + - cython>=0.29.13 - html5lib - lxml - matplotlib diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index c9a8c274fb144..4bc490e202818 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -6,7 +6,7 @@ channels: dependencies: - python=3.7.* - botocore>=1.11 - - cython>=0.28.2 + - cython>=0.29.13 - numpy - python-dateutil - nomkl diff --git a/environment.yml b/environment.yml index 93e8302b498a0..43025e9a5d03d 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - asv # building - - cython>=0.28.2 + - cython>=0.29.13 # code checks - black diff --git a/requirements-dev.txt b/requirements-dev.txt index e49ad10bfc99d..c012c2ee65afc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 diff --git a/setup.py b/setup.py index d2c6b18b892cd..50f58ceaf7c2e 100755 --- a/setup.py +++ b/setup.py @@ -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", @@ -43,7 +45,6 @@ def is_platform_mac(): } -min_cython_ver = "0.28.2" try: import Cython