From 004f13eeddc15ac3fbdec824cc1621f7629eae3c Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 16:38:39 -0500 Subject: [PATCH 1/5] Add 3.8 build to master --- .travis.yml | 10 ++++++++-- config.sh | 10 ++++++++++ multibuild | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf54a6a..0377e6c 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 @@ -68,10 +74,10 @@ before_install: - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - CONTAINER="wheels"; # pre-relesae - 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" + - TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist hypothesis" - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install diff --git a/config.sh b/config.sh index b738d4b..0f8f086 100644 --- a/config.sh +++ b/config.sh @@ -21,6 +21,16 @@ function build_wheel { build_bdist_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" + else + echo "--find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com" + fi +} + function run_tests { # Runs tests on installed distribution from an empty directory export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') diff --git a/multibuild b/multibuild index e373d06..d0cf77e 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit e373d06f9aa39cd9287b75d596bba7a95b042abb +Subproject commit d0cf77e62028704875073e3dc4626f61d1c33b0e From 302e18b8c08bf9885c9f38fb81caac084039d407 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 14 Oct 2019 16:38:57 -0500 Subject: [PATCH 2/5] temporily bump to 0.25.x --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0377e6c..9e04703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ env: global: - REPO_DIR=pandas # on release change this to a version - - BUILD_COMMIT=v0.25.1 + - BUILD_COMMIT=0.25.x - PLAT=x86_64 - UNICODE_WIDTH=32 - MB_PYTHON_OSX_VER=10.9 From 89f1bd2a3d416fb6235257fb23c1dbf6a11cc036 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 15 Oct 2019 07:52:38 -0500 Subject: [PATCH 3/5] fixed merge conflict --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5dddb8e..1ea0d37 100644 --- a/.travis.yml +++ b/.travis.yml @@ -77,7 +77,7 @@ before_install: - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - CONTAINER="wheels"; # pre-relesae - BUILD_COMMIT=$BUILD_COMMIT; - - BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP" + - 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 From b382c278f8893eda8a26adce6875488b1e1b84f3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Tue, 15 Oct 2019 07:53:33 -0500 Subject: [PATCH 4/5] Add Mac job --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1ea0d37..1dac6c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,13 @@ matrix: - NP_BUILD_DEP="numpy==1.18.0.dev0" - NP_TEST_DEP="numpy==1.18.0.dev0" + - os: osx + language: generic + 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 From 88386636a303414c0210f12acd99172b0dea372f Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Wed, 16 Oct 2019 09:43:21 -0500 Subject: [PATCH 5/5] trigger ci