Skip to content

Commit 4eb5414

Browse files
committed
Use tox for running tests in travis.
I'm still primarily testing in 2.7, but this allows me to run the suite more or less the same way it does on travis, using different python versions.
1 parent 18da78b commit 4eb5414

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ include
1010
.Python
1111
docs/_build
1212
build/
13+
.tox

.travis.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: python
2-
python:
3-
- "2.6"
4-
- "2.7"
5-
- "3.2"
6-
- "3.3"
2+
python: 2.7
73

8-
install: "pip install -r dev_requirements.txt"
4+
env:
5+
- TOX_ENV=py26
6+
- TOX_ENV=py27
7+
- TOX_ENV=py32
8+
- TOX_ENV=py33
9+
10+
install: "pip install tox"
911

1012
script: py.test

dev_requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
-e .
22

3+
tox
34
pytest
45
mock
56
webtest

tasks.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ def clean_env():
2424

2525

2626
@task
27-
def test(args):
28-
env_do('py.test %s' % ' '.join(args))
27+
def test_all():
28+
env_do('tox')
2929

3030

3131
@task

0 commit comments

Comments
 (0)