Skip to content

Commit c3124aa

Browse files
committed
Merge pull request #118 from xmlrunner/gliptak-toxtravis
Update Travis configuration to use tox-travis
2 parents c33018a + de0f62e commit c3124aa

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

.travis.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
sudo: false
2+
23
language: python
4+
35
python:
6+
- "2.6"
47
- "2.7"
8+
- "pypy"
9+
- "3.3"
10+
- "3.4"
511
install:
6-
- pip install tox codecov coveralls
12+
- pip install tox-travis codecov coveralls
713
script:
814
- tox
915
after_success:

tox.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
[tox]
2-
envlist = begin,py{26,27,33,34},py27-django{lts,curr},end,quality
2+
envlist = begin,py{26,27,py,33,34},py27-django{lts,curr},end,quality
3+
4+
[tox:travis]
5+
2.6 = py26
6+
2.7 = begin,py27,py27-django{lts,prev,curr},end,quality
7+
3.3 = py33
8+
3.4 = py34
39

410
[testenv]
511
deps =

0 commit comments

Comments
 (0)