Commit f937e1f7 authored by Matthew Brett's avatar Matthew Brett
Browse files

More attempts at fixing dependencies

parent 45db494c
...@@ -2,7 +2,7 @@ env: ...@@ -2,7 +2,7 @@ env:
global: global:
- REPO_DIR=tornado - REPO_DIR=tornado
- BUILD_COMMIT=v4.3.0 - BUILD_COMMIT=v4.3.0
- BUILD_DEPENDS=tornado - BUILD_DEPENDS=
- TEST_DEPENDS= - TEST_DEPENDS=
sudo: required sudo: required
......
Subproject commit 3fe491741fef631e6236a30d4502eaa289b510a9 Subproject commit 061dc2f9001caf621a348c134fba4674048e08e8
#!/bin/bash #!/bin/bash
# Travis steps for Linux # Travis steps for Linux
set -e set -ex
BUILD_SCRIPT=${BUILD_SCRIPT:-/io/manylinux/build_package.sh} BUILD_SCRIPT=${BUILD_SCRIPT:-/io/manylinux/build_package.sh}
......
...@@ -26,7 +26,7 @@ function build_wheels { ...@@ -26,7 +26,7 @@ function build_wheels {
git fetch origin git fetch origin
git checkout $BUILD_COMMIT git checkout $BUILD_COMMIT
git clean -fxd git clean -fxd
pip install $BUILD_DEPENDS if [-n "$BUILD_DEPENDS" ]; then pip install $BUILD_DEPENDS; fi
pip wheel -w $WHEELHOUSE --no-deps . pip wheel -w $WHEELHOUSE --no-deps .
cd .. cd ..
pip install delocate pip install delocate
......
#!/bin/bash #!/bin/bash
WHEELHOUSE=$PWD/wheelhouse WHEELHOUSE=$PWD/wheelhouse
if [ !-d $WHEELHOUSE ]; then mkdir wheelhouse; fi if [ !-d $WHEELHOUSE ]; then mkdir wheelhouse; fi
PKG_NAME=${PKG_NAME:-$REPO_DIR}
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
source travis_osx_steps.sh source travis_osx_steps.sh
whl_tail="*.whl"
else else
source travis_linux_steps.sh source travis_linux_steps.sh
whl_tail="*manylinux1_x86_64.whl"
fi fi
function install_wheel { function install_wheel {
if [ -n "$TEST_DEPENDS" ]; then pip install $TEST_DEPENDS; fi if [ -n "$TEST_DEPENDS" ]; then pip install $TEST_DEPENDS; fi
pip install -f $WHEELHOUSE --no-index $PKG_NAME pip install $WHEELHOUSE/$whl_tail
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment