Skip to content

Commit 971f60d

Browse files
committed
TOXENV is tox supported env
1 parent ecfa743 commit 971f60d

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.travis-install.sh renamed to .travis-workarounds.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
set -e
33
set -x
44

5-
if [[ "${TOX_ENV}" == "pypy" ]]; then
5+
if [[ "${TOXENV}" == "pypy" ]]; then
66
sudo add-apt-repository -y ppa:pypy/ppa
77
sudo apt-get -qy update
88
sudo apt-get install -y pypy
99
# This is required because we need to get rid of the Travis installed PyPy
1010
# or it'll take precedence over the PPA installed one.
1111
sudo rm -rf /usr/local/pypy/bin
1212
fi
13-
14-
pip install tox coveralls

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
language: python
22
python: 2.7
33
env:
4-
- TOX_ENV=py27
5-
- TOX_ENV=precise
6-
- TOX_ENV=trunk
7-
- TOX_ENV=pypy
4+
- TOXENV=py27
5+
- TOXENV=precise
6+
- TOXENV=trunk
7+
- TOXENV=pypy
88

99
matrix:
1010
allow_failures:
11-
- env: TOX_ENV=pypy
11+
- env: TOXENV=pypy
1212

1313
install:
14-
- ./.travis-install.sh
14+
- ./.travis-workarounds.sh
15+
- pip install -M tox
1516

16-
script:
17-
- tox -e $TOX_ENV
17+
script: tox
1818

1919
notifications:
2020
irc:

0 commit comments

Comments
 (0)