Skip to content

Commit 20f812b

Browse files
committed
update travis config
1 parent f67ff72 commit 20f812b

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

.travis.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
language: python
2+
sudo: false
23

34
python:
45
- "2.6"
56
- "2.7"
67
- "3.2"
78
- "3.3"
89
- "3.4"
10+
- "3.5"
911
- "pypy"
1012

1113
install:
1214
- pip install .
13-
- pip install pytest --use-mirrors
15+
- pip install tox pytest>=2.8.2
1416
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install 'django<1.5'; fi
1517
- if [[ $TRAVIS_PYTHON_VERSION != '2.6' ]]; then travis_retry pip install 'django>=1.6'; fi
18+
- "TOX_ENV=${TRAVIS_PYTHON_VERSION/[0-9].[0-9]/py${TRAVIS_PYTHON_VERSION/.}}"
1619

1720

1821
branches:
1922
only:
2023
- develop
24+
- feature/travis
2125

22-
script:
23-
py.test
26+
script: tox -e $TOX_ENV
27+
28+
before_cache:
29+
- rm -rf $HOME/.cache/pip/log
30+
31+
cache:
32+
directories:
33+
- $HOME/.cache/pip

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ deps = pytest
77

88
commands =
99
pip install -e {toxinidir}
10-
py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
10+
py.test {posargs}
1111

1212
[pytest]
1313
pep8ignore = E128 E302
@@ -16,7 +16,7 @@ python_files=test_echo.py
1616

1717
addopts =
1818
--tb=short
19-
--capture=no
19+
--capture=sys
2020

2121
[flake8]
2222
exclude = .tox,docs

0 commit comments

Comments
 (0)