From 8b671f7b889b1ad1ecb8ba80267e40b2c82effb3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 11 Sep 2019 14:13:06 -0500 Subject: [PATCH 1/5] DEP: Bump Cython to 0.29.13 In preperation for Python 3.8, we need to ensure we compile the sdist with new enough versions of Cython. This is the latest current release. --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-36-32bit.yaml | 2 +- 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 | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/azure-windows-37.yaml | 2 +- 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 +- setup.py | 3 ++- 15 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 97c45b2be27d7..91ad68eab6a0a 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -18,7 +18,7 @@ dependencies: - xlsxwriter=0.9.8 - xlwt=1.2.0 # universal - - cython=0.28.2 + - cython=0.29.13 - hypothesis>=3.58.0 - pytest-xdist - pytest-mock diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 43bf0ecdd6c3e..a9fb8dbe59a6a 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -6,7 +6,7 @@ dependencies: - gcc_linux-32 - gcc_linux-32 - gxx_linux-32 - - cython=0.28.2 + - cython=0.29.13 - numpy=1.14.* - python-dateutil - python=3.6.* 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 26dcd213bbfa0..24464adb74f5b 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 65c92ec1dcf0d..0fb06fd43724c 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 < 5 until defaults has pytest-xdist>=1.29.0 - pytest>=4.0.2,<5.0 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 39315b15a018b..ce7066b81d6e3 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -4,7 +4,7 @@ channels: dependencies: - beautifulsoup4 - bottleneck - - cython>=0.28.2 + - cython>=0.29.13 - html5lib - jinja2 - lxml diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index 6f4467b2880ba..88b38aaef237c 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -20,7 +20,7 @@ dependencies: - xlsxwriter - xlwt # universal - - cython>=0.28.2 + - cython>=0.29.13 - pytest>=5.0.1 - pytest-xdist>=1.29.0 - pytest-mock diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 075234a937035..7680ed9fd9c92 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -25,7 +25,7 @@ dependencies: - xlsxwriter - xlwt # universal - - cython>=0.28.2 + - cython>=0.29.13 - pytest>=5.0.0 - pytest-xdist>=1.29.0 - pytest-mock diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 19002cbb8575e..b2a74fceaf0fa 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 9e08c41a3d9c0..903636f2fe060 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 d72972ffc4da4..5bf66961e071a 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/setup.py b/setup.py index 05e5f5250e250..60e3f7ff78a10 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 From 70916e773e9ec3b790f288d7aa67b810f9e51a88 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 11 Sep 2019 14:24:19 -0500 Subject: [PATCH 2/5] 32-bit from pip --- ci/deps/azure-36-32bit.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index a9fb8dbe59a6a..72ce545e2e992 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.29.13 - 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 From fe81f0e05791193c0ac06d8744b8b22a21cab34b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 11 Sep 2019 15:19:55 -0500 Subject: [PATCH 3/5] fixup --- ci/deps/azure-36-32bit.yaml | 2 +- ci/deps/azure-macos-35.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/deps/azure-36-32bit.yaml b/ci/deps/azure-36-32bit.yaml index 72ce545e2e992..321cc203961d5 100644 --- a/ci/deps/azure-36-32bit.yaml +++ b/ci/deps/azure-36-32bit.yaml @@ -19,4 +19,4 @@ dependencies: - pip - pip: # Anaconda doesn't build a new enough Cython - - cython=0.29.13 + - cython>=0.29.13 diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index ce7066b81d6e3..4e0f09904b695 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.29.13 - html5lib - jinja2 - lxml @@ -24,6 +23,8 @@ dependencies: - xlwt - pip - pip: + # Anaconda / conda-forge don't build for 3.5 + - cython>=0.29.13 - pyreadstat # universal - pytest>=5.0.1 @@ -32,4 +33,3 @@ dependencies: - hypothesis>=3.58.0 # https://github.com/pandas-dev/pandas/issues/27421 - pytest-azurepipelines<1.0.0 - From b597c4e25e61eaba7e065e0051c776f42d510943 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 11 Sep 2019 15:20:08 -0500 Subject: [PATCH 4/5] bump requirements.txt --- requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index c0fb9ee331b11..3f4636043dbac 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 From 01752f5388a7c2a518f0afdeaa874d5a52be006b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 11 Sep 2019 16:10:39 -0500 Subject: [PATCH 5/5] 35 compat --- ci/deps/azure-35-compat.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 91ad68eab6a0a..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.29.13 - 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