diff --git a/.travis.yml b/.travis.yml index edfca9234..b6a8d532f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ env: - PLAT=x86_64 - UNICODE_WIDTH=32 - BUILD_DEPENDS="" - - TEST_DEPENDS="pytest pytest-cov numpy scipy wheel==0.31.1" + - TEST_DEPENDS="pytest pytest-cov numpy scipy" - WHEELHOUSE_UPLOADER_USERNAME=travis-worker # Following generated with # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET= diff --git a/config.sh b/config.sh index 48fd4c75a..c3106c8b9 100644 --- a/config.sh +++ b/config.sh @@ -69,16 +69,3 @@ function run_tests { fi return $ret } - -if [ -n "$IS_OSX" ]; then - function before_install { - # Custom before_install to temporarily pin wheel to 0.31.1 - brew cask uninstall oclint || true - export CC=clang - export CXX=clang++ - get_macpython_environment $MB_PYTHON_VERSION venv - source venv/bin/activate - pip install --upgrade pip - pip install wheel==0.31.1 - } -fi \ No newline at end of file diff --git a/multibuild b/multibuild index 3a77d1231..951b6c64f 160000 --- a/multibuild +++ b/multibuild @@ -1 +1 @@ -Subproject commit 3a77d1231ce474ff3b1246792d6e5176c58d0499 +Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b