From 35092e11f78ca5ca6a71dcddb1b536c1ee4cd374 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 6 Jan 2020 14:16:20 -0600 Subject: [PATCH 1/4] bump numpy --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc3b9f6..1ecf3fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,8 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP="numpy==1.18.0.dev0" - - NP_TEST_DEP="numpy==1.18.0.dev0" + - NP_BUILD_DEP="numpy==1.18.0" + - NP_TEST_DEP="numpy==1.18.0" - os: linux env: From c5ccfbc2e9fba10e5a029a7178216763a870724d Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 6 Jan 2020 15:13:58 -0600 Subject: [PATCH 2/4] remove 35 --- .travis.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ecf3fc..95e742e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,6 @@ matrix: - MB_PYTHON_VERSION=3.8 - NP_BUILD_DEP="numpy==1.18.0" - NP_TEST_DEP="numpy==1.18.0" - - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - os: linux env: - MB_PYTHON_VERSION=3.6 @@ -48,14 +44,6 @@ matrix: env: - MB_PYTHON_VERSION=3.6 - PLAT=i686 - - os: osx - language: generic - 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: From d3912222f9a1f650d876f04e637bf0446b5cf8f9 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 6 Jan 2020 15:18:02 -0600 Subject: [PATCH 3/4] cleanup --- .travis.yml | 16 ++++++++++++++-- config.sh | 10 ---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95e742e..7a54207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,16 @@ matrix: - os: linux env: - MB_PYTHON_VERSION=3.8 - - NP_BUILD_DEP="numpy==1.18.0" - - NP_TEST_DEP="numpy==1.18.0" + - NP_BUILD_DEP="numpy==1.17.3" + - NP_TEST_DEP="numpy==1.17.3" + + - os: osx + language: generic + env: + - MB_PYTHON_VERSION=3.8 + - NP_BUILD_DEP="numpy==1.17.3" + - NP_TEST_DEP="numpy==1.17.3" + - os: linux env: - MB_PYTHON_VERSION=3.6 @@ -40,6 +48,10 @@ 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.5 + - PLAT=i686 - os: linux env: - MB_PYTHON_VERSION=3.6 diff --git a/config.sh b/config.sh index 57dbf89..63ad9b2 100644 --- a/config.sh +++ b/config.sh @@ -22,16 +22,6 @@ 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" - 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))') From 246ab51b85cb44075fa95cdbd23e27c032b292f3 Mon Sep 17 00:00:00 2001 From: Tom Augspurger Date: Mon, 6 Jan 2020 16:28:42 -0600 Subject: [PATCH 4/4] another 35 --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7a54207..a99270c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,10 +48,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.5 - - PLAT=i686 - os: linux env: - MB_PYTHON_VERSION=3.6