Merge pull request #105 from radarhere/wheel

Removed pinning of wheel
This commit is contained in:
Hugo 2018-10-15 13:33:19 +03:00 committed by GitHub
commit 5008a37c0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 15 deletions

View File

@ -5,7 +5,7 @@ env:
- PLAT=x86_64 - PLAT=x86_64
- UNICODE_WIDTH=32 - UNICODE_WIDTH=32
- BUILD_DEPENDS="" - 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 - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
# Following generated with # Following generated with
# travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key> # travis encrypt -r python-pillow/pillow-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>

View File

@ -69,16 +69,3 @@ function run_tests {
fi fi
return $ret 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

@ -1 +1 @@
Subproject commit 3a77d1231ce474ff3b1246792d6e5176c58d0499 Subproject commit 951b6c64f01853cf2569000bb30ecd01a16bba0b