Skip to content

Commit

Permalink
Merge 5735d19 into a690e94
Browse files Browse the repository at this point in the history
  • Loading branch information
posborne committed Jul 27, 2016
2 parents a690e94 + 5735d19 commit fdcd2b3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ language: python
python: 3.5
env:
- TOX_ENV=py27
- TOX_ENV=py32
- TOX_ENV=py33
- TOX_ENV=py34
- TOX_ENV=py35
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py32,py33,py34,pypy,pypy3
envlist = py27,py32,py33,py34,py35,pypy,pypy3

[testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
Expand All @@ -10,7 +10,7 @@ commands=nosetests --with-doctest --doctest-options='+ELLIPSIS,+NORMALIZE_WHITES
[testenv:coverage]
deps=
{[testenv]deps}
python-coveralls
coveralls
commands =
coverage run --branch --omit={envdir}/* {envbindir}/nosetests
coveralls
6 changes: 3 additions & 3 deletions toxtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
pyversions=(2.7.10
3.3.5
3.4.3
3.5.0
pypy-4.0.0
pypy3-2.4.0)
3.5.2
pypy-5.3.1
pypy3-5.2)

# parse options
for i in "$@"
Expand Down

0 comments on commit fdcd2b3

Please sign in to comment.