File tree Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Expand file tree Collapse file tree 2 files changed +15
-5
lines changed Original file line number Diff line number Diff line change 1
1
language : python
2
+ sudo : false
2
3
3
4
python :
4
5
- " 2.6"
5
6
- " 2.7"
6
7
- " 3.2"
7
8
- " 3.3"
8
9
- " 3.4"
10
+ - " 3.5"
9
11
- " pypy"
10
12
11
13
install :
12
14
- pip install .
13
- - pip install pytest --use-mirrors
15
+ - pip install tox pytest>=2.8.2
14
16
- if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install 'django<1.5'; fi
15
17
- 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/.}}"
16
19
17
20
18
21
branches :
19
22
only :
20
23
- develop
24
+ - feature/travis
21
25
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
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ deps = pytest
7
7
8
8
commands =
9
9
pip install -e {toxinidir}
10
- py.test -- junitxml ={envlogdir}/junit-{envname}.xml {posargs}
10
+ py.test {posargs}
11
11
12
12
[pytest]
13
13
pep8ignore = E128 E302
@@ -16,7 +16,7 @@ python_files=test_echo.py
16
16
17
17
addopts =
18
18
--tb =short
19
- --capture =no
19
+ --capture =sys
20
20
21
21
[flake8]
22
22
exclude = .tox,docs
You can’t perform that action at this time.
0 commit comments