tox: add py35 envs for convenience

py35 jobs are going to be run in the gate soon. Add py35 to the list
of defaut envs and add corresponding pifpaf environments for running
tests locally.

All py35 tests currently pass - we can effectively declare py35
compatibility via a new classifier in setup.cfg.

Change-Id: Iea7e286062f95d5c61b9ec1e7f6af4138fe3ce99
This commit is contained in:
Roman Podoliaka 2016-07-04 17:31:18 +03:00
parent 3e3db134c0
commit 72bab42e00
2 changed files with 14 additions and 2 deletions

View File

@ -17,6 +17,7 @@ classifier =
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
[extras]
# So e.g. nova can test-depend on oslo.db[mysql]

15
tox.ini
View File

@ -1,6 +1,6 @@
[tox]
minversion = 1.8
envlist = py34,py27,pep8,pip-missing-reqs
envlist = py35,py34,py27,pep8,pip-missing-reqs
[testenv]
whitelist_externals = bash
@ -8,7 +8,7 @@ whitelist_externals = bash
setenv =
VIRTUAL_ENV={envdir}
deps = .[test,fixtures,mysql,postgresql]
py{27,34}-{postgresql,mysql,all}: .[pifpaf]
py{27,34,35}-{postgresql,mysql,all}: .[pifpaf]
commands = bash tools/pretty_tox.sh '{posargs}'
passenv = OS_TEST_DBAPI_ADMIN_CONNECTION
@ -27,6 +27,9 @@ commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TE
[testenv:py34-all]
commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:py35-all]
commands = pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql -- pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql -- {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:py27-mysql]
commands =
pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
@ -39,10 +42,18 @@ commands =
commands =
pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:py35-mysql]
commands =
pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run mysql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:py34-postgresql]
commands =
pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:py35-postgresql]
commands =
pifpaf -g OS_TEST_DBAPI_ADMIN_CONNECTION run postgresql {toxinidir}/tools/run-pifpaf-tests.sh {posargs}
[testenv:mysql-python]
deps = .[mysql-c,postgresql,test,fixtures]
setenv =