Skip to content
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

Jump to bottom

chore(tox): Use standard variable to determine tox environment #660

Merged
merged 2 commits into from
Nov 23, 2015
Merged

chore(tox): Use standard variable to determine tox environment #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d30f8c
chore(tox): Use standard variable to determine tox environment
Nov 17, 2015
2d3357b
Merge branch 'master' into travis_toxenv
kgriffs Nov 23, 2015
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
26 changes: 13 additions & 13 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ cache:
directories:
- $HOME/.cache/pip
env:
- TOX_ENV=py26
- TOX_ENV=py27
- TOX_ENV=py27_cython
- TOX_ENV=py33
- TOX_ENV=py33_cython
- TOX_ENV=py34
- TOX_ENV=py34_cython
- TOX_ENV=pypy
- TOX_ENV=pypy3
- TOX_ENV=pep8
- TOX_ENV=pylint
- TOX_ENV=py27_smoke
- TOX_ENV=py27_smoke_cython
- TOXENV=py26
- TOXENV=py27
- TOXENV=py27_cython
- TOXENV=py33
- TOXENV=py33_cython
- TOXENV=py34
- TOXENV=py34_cython
- TOXENV=pypy
- TOXENV=pypy3
- TOXENV=pep8
- TOXENV=pylint
- TOXENV=py27_smoke
- TOXENV=py27_smoke_cython
- JYTHON=true

script: travis_scripts/run_tests.sh
Expand Down
2 changes: 1 addition & 1 deletion travis_scripts/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ if [ "$JYTHON" = "true" ]; then
# Smoke test
$HOME/jython/bin/jython falcon/bench/bench.py -t 1 -b falcon falcon-ext
else
tox -e $TOX_ENV
tox
fi