Skip to content

Commit

Permalink
Use tox-travis, drop tests for python 3.2, and run tests on two lates…
Browse files Browse the repository at this point in the history
…t pytest releases
  • Loading branch information
davehunt committed Jul 4, 2016
1 parent 004c012 commit 5d0df34
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
33 changes: 18 additions & 15 deletions .travis.yml
@@ -1,20 +1,23 @@
language: python
python:
- 2.6
- 2.7
- 3.3
- 3.4
- 3.5
- pypy
- pypy3
- nightly
env:
- TOXENV=py26
- TOXENV=py27
- TOXENV=py33
- TOXENV=py34
- TOXENV=py35
- TOXENV=pypy
- TOXENV=pypy3
- TOXENV=flake8
- TOXENV=pytest28
- TOXENV=pytest29
matrix:
include:
- python: 2.7
env: TOXENV=flake8
- python: 3.5
env: TOXENV=flake8
install:
- pip install tox
- pip install tox-travis
script:
- tox
addons:
apt:
sources:
- deadsnakes
packages:
- python3.5
13 changes: 5 additions & 8 deletions tox.ini
Expand Up @@ -4,23 +4,20 @@
# and then run "tox" from this directory.

[tox]
envlist = py{26,27,32,33,34,35,py,py3}, flake8
envlist = py{26,27,33,34,35,py,py3}-pytest{28,29}, flake8

[testenv]
commands = py.test -v -r fEsxXw {posargs}
deps =
pytest==2.9.2
pytest28: pytest==2.8.7
pytest29: pytest==2.9.2
hjson==1.5.6
PyYAML==3.11

[testenv:py32]
deps =
pytest==2.9.2
PyYAML==3.11

[testenv:py35]
deps =
pytest==2.9.2
pytest28: pytest==2.8.7
pytest29: pytest==2.9.2
hjson==1.5.6

[testenv:flake8]
Expand Down

0 comments on commit 5d0df34

Please sign in to comment.