diff --git a/.travis.yml b/.travis.yml index a37b814..13c681f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ env: - BUILD_COMMIT=v0.24.2 - PLAT=x86_64 - UNICODE_WIDTH=32 - - NP_BUILD_DEP="numpy==1.12.1" - - NP_TEST_DEP="numpy==1.12.1" + - MB_PYTHON_OSX_VER=10.9 + - NP_BUILD_DEP="numpy==1.13.3" + - NP_TEST_DEP="numpy==1.13.3" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker # Following generated with # travis encrypt -r MacPython/pandas-wheels WHEELHOUSE_UPLOADER_SECRET= @@ -26,34 +27,17 @@ matrix: # Exclude the default Python 3.5 build - python: 3.5 include: - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP="numpy==1.14.5" - - NP_TEST_DEP="numpy==1.14.5" - - os: osx - language: generic - env: - - 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=2.7 - - os: linux - env: - - MB_PYTHON_VERSION=2.7 - - PLAT=i686 - os: linux env: - MB_PYTHON_VERSION=3.5 - os: linux env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 + - MB_PYTHON_VERSION=3.6 - os: linux env: - - MB_PYTHON_VERSION=3.6 + - 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.6 @@ -61,30 +45,29 @@ matrix: - os: osx language: generic env: - - MB_PYTHON_VERSION=2.7 - - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 + - MB_PYTHON_VERSION=3.5 + - MB_PYTHON_OSX_VER=10.6 # no python.org 10.9 builds for 3.5 - os: osx language: generic env: - - MB_PYTHON_VERSION=3.5 - - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 + - MB_PYTHON_VERSION=3.6 - os: osx language: generic env: - - MB_PYTHON_VERSION=3.6 - - MACOSX_DEPLOYMENT_TARGET=10.6 # since pandas PR24274, mac builds default to 10.9 - + - MB_PYTHON_VERSION=3.7 + - NP_BUILD_DEP="numpy==1.14.5" + - NP_TEST_DEP="numpy==1.14.5" before_install: # See: # https://github.com/travis-ci/travis-ci/issues/8920#issuecomment-352661024 - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - - CONTAINER="wheels"; + - CONTAINER="wheels"; # pre-relesae - BUILD_COMMIT=$BUILD_COMMIT; - BUILD_DEPENDS="$NP_BUILD_DEP Cython==0.28.2" # 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==3.8.2 pytest-xdist pytest-mock moto hypothesis wheel==0.31.1 cryptography --only-binary=cryptography" + - 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" - source multibuild/common_utils.sh - source multibuild/travis_steps.sh - before_install diff --git a/config.sh b/config.sh index 1eb3065..50df385 100644 --- a/config.sh +++ b/config.sh @@ -4,7 +4,15 @@ function pre_build { # Any stuff that you need to do before you start building the wheels # Runs in the root directory of this repository. - : + if [ -n "$IS_OSX" ]; then + # Override pandas' default minimum MACOSX_DEPLOYEMENT_TARGET=10.9, + # so we can build for older Pythons if we really want to. + # See https://github.com/pandas-dev/pandas/pull/24274 + local _plat=$(get_distutils_platform) + if [[ -z $MACOSX_DEPLOYMENT_TARGET && "$_plat" =~ macosx-(10\.[0-9]+)-.* ]]; then + export MACOSX_DEPLOYMENT_TARGET=${BASH_REMATCH[1]} + fi + fi } function build_wheel { @@ -17,7 +25,5 @@ function run_tests { # Runs tests on installed distribution from an empty directory export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))') python -c 'import pandas; pandas.show_versions()' - # --deselect for 0.24.x - # https://travis-ci.org/MacPython/pandas-wheels/builds/505474702 - python -c 'import pandas; pandas.test(extra_args=["--skip-slow", "--skip-network", "--skip-db", "-n=2", "-k -test_numpy_ufuncs", "-k -test_write_fspath_all"])' || true + python -c 'import pandas; pandas.test(extra_args=["--skip-slow", "--skip-network", "--skip-db", "-n=2"])' } diff --git a/pandas b/pandas index 07739aa..2243629 160000 --- a/pandas +++ b/pandas @@ -1 +1 @@ -Subproject commit 07739aadda4a9afda31fe9ab5d7b01d19f3f1199 +Subproject commit 224362951942e1f4e05fb8948596620aedac26d9