Remove py34 from unit tests, use sphinx 1.4.9 for docs
Change-Id: I64599de35cae3d2eab655d13dd6c49ed23536aa7
This commit is contained in:
parent
8fb07e2cc1
commit
1e65c771a0
|
@ -1,3 +1,4 @@
|
|||
sphinx<=1.4.9
|
||||
mock>=1.2
|
||||
pytest>=2.7.1
|
||||
pytest-django >= 2.8.0
|
||||
|
|
11
tox.ini
11
tox.ini
|
@ -5,7 +5,7 @@
|
|||
|
||||
[tox]
|
||||
minversion = 2.0
|
||||
envlist = pep8, py{27,34,35}, pylint, pylint-py{27,34,35}, cover, docs
|
||||
envlist = pep8, py{27,35}, pylint, pylint-py{27,35}, cover, docs
|
||||
skipsdist = True
|
||||
skip_missing_interpreters = True
|
||||
|
||||
|
@ -14,7 +14,6 @@ skip_missing_interpreters = True
|
|||
usedevelop = True
|
||||
passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
|
||||
deps =
|
||||
sphinx
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
commands =
|
||||
py.test -vv {posargs:devops/tests}
|
||||
|
@ -51,12 +50,6 @@ deps=
|
|||
pylint
|
||||
commands=pylint devops bin/dos.py
|
||||
|
||||
[testenv:pylint-py34]
|
||||
deps=
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
pylint
|
||||
commands=pylint devops bin/dos.py
|
||||
|
||||
[testenv:pylint-py35]
|
||||
deps=
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
|
@ -73,6 +66,4 @@ count = True
|
|||
DJANGO_SETTINGS_MODULE=devops.test_settings
|
||||
|
||||
[testenv:docs]
|
||||
deps =
|
||||
sphinx
|
||||
commands = python setup.py build_sphinx
|
||||
|
|
Loading…
Reference in New Issue