From c40589b1271b7998525b0fb0cff2b67064879fb2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 13:53:35 -0500 Subject: [PATCH 01/13] Bump multibuild --- multibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multibuild b/multibuild index e373d06..d0cf77e 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit e373d06f9aa39cd9287b75d596bba7a95b042abb +Subproject commit d0cf77e62028704875073e3dc4626f61d1c33b0e From b6b194db0a75733c7e7f581b81b728e048241236 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 13:53:48 -0500 Subject: [PATCH 02/13] Add 3.8 build --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index b1567b1..dd55c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,13 @@ matrix: - MB_PYTHON_VERSION=3.7 - NP_BUILD_DEP="numpy==1.14.5" - NP_TEST_DEP="numpy==1.14.5" + + - os: linux + env: + - MB_PYTHON_VERSION=3.8 + - NP_BUILD_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.14.5" + - os: linux env: - MB_PYTHON_VERSION=3.6 From e7358a0c722d5f45dee908a0aa748065ac8d8dc5 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 13:58:28 -0500 Subject: [PATCH 03/13] bump test dep --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dd55c3f..dc098c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ matrix: env: - MB_PYTHON_VERSION=3.7 - NP_BUILD_DEP="numpy==1.14.5" - - NP_TEST_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.18.0.dev0" before_install: # See: From 874d309c78b7d65ee76071a70c066de7f9d94bf4 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:19:53 -0500 Subject: [PATCH 04/13] remove Cython pin --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index dc098c8..6e6fbd0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ before_install: - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - CONTAINER="pre-release"; - BUILD_COMMIT=$BUILD_COMMIT; - - BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2" + - BUILD_DEPENDS="$NP_BUILD_DEP Cython" # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589 # Moto picks it up, and they don't distribute 32-bit wheels. - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography" From fab3ea7d217a2d6e1796450b000b0a17e42beb3c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:26:50 -0500 Subject: [PATCH 05/13] dev install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e6fbd0..8090558 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.14.5" + - NP_BUILD_DEP="numpy==1.18.0.dev0" - NP_TEST_DEP="numpy==1.18.0.dev0" before_install: From 3d66217e7c937d7bee096d07f8302aa419f44a1d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:33:00 -0500 Subject: [PATCH 06/13] edit the right section --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8090558..8584c9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,12 @@ matrix: # Exclude the default Python 3.5 build - python: 3.5 include: + - os: linux + env: + - MB_PYTHON_VERSION=3.8 + - NP_BUILD_DEP="numpy==1.18.0.dev0" + - NP_TEST_DEP="numpy==1.18.0.dev0" + - os: linux env: - MB_PYTHON_VERSION=3.5 @@ -38,13 +44,6 @@ matrix: - MB_PYTHON_VERSION=3.7 - NP_BUILD_DEP="numpy==1.14.5" - NP_TEST_DEP="numpy==1.14.5" - - - os: linux - env: - - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP="numpy==1.14.5" - - NP_TEST_DEP="numpy==1.14.5" - - os: linux env: - MB_PYTHON_VERSION=3.6 @@ -62,8 +61,8 @@ matrix: language: generic env: - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.18.0.dev0" - - NP_TEST_DEP="numpy==1.18.0.dev0" + - NP_BUILD_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.14.5" before_install: # See: From 5fcfc35f9df2377564c72598ee6886273138900b Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:40:26 -0500 Subject: [PATCH 07/13] pre for 3.8 --- config.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.sh b/config.sh index 50df385..522235e 100644 --- a/config.sh +++ b/config.sh @@ -21,6 +21,13 @@ function build_wheel { build_bdist_wheel $@ } + +function pip_opts { + # Add --pre for 3.8 build until NumPy has a 3.8-compatible release. + [ -n "$MANYLINUX_URL" ] && echo "--find-links $MANYLINUX_URL --pre" +} + + function run_tests { # Runs tests on installed distribution from an empty directory export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') From 7015776cdf3c5495dcd8a767ac9fa784291ca998 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:45:11 -0500 Subject: [PATCH 08/13] try always --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 522235e..36acc9d 100644 --- a/config.sh +++ b/config.sh @@ -24,7 +24,8 @@ function build_wheel { function pip_opts { # Add --pre for 3.8 build until NumPy has a 3.8-compatible release. - [ -n "$MANYLINUX_URL" ] && echo "--find-links $MANYLINUX_URL --pre" + # [ -n "$MANYLINUX_URL" ] && echo "--find-links $MANYLINUX_URL --pre" + echo "--pre" } From 96d1b0f72c089a738f14735c3d6c08949e7daafe Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:57:43 -0500 Subject: [PATCH 09/13] add -f --- config.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config.sh b/config.sh index 36acc9d..ca89fa4 100644 --- a/config.sh +++ b/config.sh @@ -24,8 +24,11 @@ function build_wheel { function pip_opts { # Add --pre for 3.8 build until NumPy has a 3.8-compatible release. - # [ -n "$MANYLINUX_URL" ] && echo "--find-links $MANYLINUX_URL --pre" - echo "--pre" + if [-n "$MANYLINUX_URL" ]; then + echo "--find-links $MANYLINUX_URL --find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com' --pre" + else + echo "--find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com' --pre" + fi } From 164574925b01063b132ff000b2a14c087428da54 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 14:59:14 -0500 Subject: [PATCH 10/13] remove pre --- config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.sh b/config.sh index ca89fa4..6e30748 100644 --- a/config.sh +++ b/config.sh @@ -23,11 +23,11 @@ function build_wheel { function pip_opts { - # Add --pre for 3.8 build until NumPy has a 3.8-compatible release. + # Add pre-release index until official NumPy release with 3.8 if [-n "$MANYLINUX_URL" ]; then - echo "--find-links $MANYLINUX_URL --find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com' --pre" + echo "--find-links $MANYLINUX_URL --find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com'" else - echo "--find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com' --pre" + echo "--find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com'" fi } From 826835373ee587a1c063f2836ce2896153761cf2 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 15:00:58 -0500 Subject: [PATCH 11/13] fixups --- config.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.sh b/config.sh index 6e30748..57dbf89 100644 --- a/config.sh +++ b/config.sh @@ -24,10 +24,10 @@ function build_wheel { function pip_opts { # Add pre-release index until official NumPy release with 3.8 - if [-n "$MANYLINUX_URL" ]; then - echo "--find-links $MANYLINUX_URL --find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com'" + if [ -n "$MANYLINUX_URL" ]; then + echo "--find-links $MANYLINUX_URL --find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" else - echo "--find-links='https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com'" + echo "--find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" fi } From b3ed55fe5f52262c69c60af52a89cfe4efd6f5fd Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 15:23:59 -0500 Subject: [PATCH 12/13] simplify test_depends --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8584c9c..3e41f0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,7 +73,7 @@ before_install: - BUILD_DEPENDS="$NP_BUILD_DEP Cython" # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589 # Moto picks it up, and they don't distribute 32-bit wheels. - - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography" + - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist hypothesis" - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install From 79ad3f1a7f865d680567d2de9b8dc296b87ec99b Mon Sep 17 00:00:00 2001 From: robbuckley <20515024+robbuckley@users.noreply.github.com> Date: Tue, 15 Oct 2019 02:26:21 +0100 Subject: [PATCH 13/13] install latest pip, add setuptools_scm to BUILD_DEPENDS (#62) * install latest pip, add setuptools_scm to BUILD_DEPENDS * remove comments * pre-install setuptools_scm only for mac 3.5 build (cherry picked from commit 1508d26c84da930bbf571b5e51521343ff948b1c) --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e41f0b..cc3b9f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,9 @@ matrix: env: - MB_PYTHON_VERSION=3.5 - MB_PYTHON_OSX_VER=10.6 # no python.org 10.9 builds for 3.5 + # WAR for setup_requires TLS issue with Python 3.5 on macOS + # see https://github.com/pandas-dev/pandas/issues/28954 + - EXTRA_BUILD_DEP="setuptools_scm" - os: osx language: generic env: @@ -70,9 +73,7 @@ before_install: - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - CONTAINER="pre-release"; - BUILD_COMMIT=$BUILD_COMMIT; - - BUILD_DEPENDS="$NP_BUILD_DEP Cython" - # binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589 - # Moto picks it up, and they don't distribute 32-bit wheels. + - BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython" - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist hypothesis" - source multibuild/common_utils.sh - source multibuild/travis_steps.sh