Skip to content

Fix Travis #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2017
Merged

Fix Travis #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
- SIX_VERSION=1.9 USE_OPTIONAL=true

install:
- bash requirements-install.sh
- ./requirements-install.sh

script:
- if [[ $TRAVIS_PYTHON_VERSION == pypy* ]]; then py.test; fi
Expand Down
9 changes: 3 additions & 6 deletions requirements-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
#!/bin/bash -e
#!/bin/bash -ex

if [[ $USE_OPTIONAL != "true" && $USE_OPTIONAL != "false" ]]; then
echo "fatal: \$USE_OPTIONAL not set to true or false. Exiting."
exit 1
fi
pip install pip==6.1.0

pip install -U -r requirements-test.txt

if [[ $USE_OPTIONAL == "true" ]]; then
pip install -U -r requirements-optional.txt
fi

if [[ $SIX_VERSION != "false" ]]; then
if [[ $SIX_VERSION ]]; then
pip install six==$SIX_VERSION
fi

Expand Down