Merge "Remove references to Python 3.4"
This commit is contained in:
commit
0d0859573d
12
tox.ini
12
tox.ini
@ -1,6 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
minversion = 2.0
|
minversion = 2.0
|
||||||
envlist = py{35,34,27},functional,pep8,pip-missing-reqs
|
envlist = py{35,27},functional,pep8,pip-missing-reqs
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
@ -16,8 +16,8 @@ setenv = VIRTUAL_ENV={envdir}
|
|||||||
LANGUAGE=en_US
|
LANGUAGE=en_US
|
||||||
LC_ALL=en_US.utf-8
|
LC_ALL=en_US.utf-8
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
# NOTE(mriedem): If py34 fails with "db type could not be determined", delete
|
# NOTE(mriedem): If py35 fails with "db type could not be determined", delete
|
||||||
# .testrepository and try again. Running py34 before py27 is OK, but not the
|
# .testrepository and try again. Running py35 before py27 is OK, but not the
|
||||||
# other way around. See: https://bugs.launchpad.net/testrepository/+bug/1212909
|
# other way around. See: https://bugs.launchpad.net/testrepository/+bug/1212909
|
||||||
commands =
|
commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
@ -31,12 +31,6 @@ commands =
|
|||||||
bash tools/pretty_tox.sh '{posargs}'
|
bash tools/pretty_tox.sh '{posargs}'
|
||||||
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
|
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
|
||||||
|
|
||||||
[testenv:py34]
|
|
||||||
commands =
|
|
||||||
{[testenv]commands}
|
|
||||||
bash tools/pretty_tox3.sh '{posargs}'
|
|
||||||
env TEST_OSPROFILER=1 bash tools/pretty_tox.sh 'nova.tests.unit.test_profiler'
|
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
|
Loading…
Reference in New Issue
Block a user