diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-19 10:02:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-19 10:02:11 +0000 |
| commit | b791ed51a23ac82efbb398caab72371a96be0081 (patch) | |
| tree | f963d7259731cf4f5d77255e1ab173099f9019c3 | |
| parent | cc529f382933ce1a8fa2e410fd993114bf419013 (diff) | |
| parent | 72bab42e00f7c72bea74e92a044d942f8769a9a3 (diff) | |
| download | oslo-db-b791ed51a23ac82efbb398caab72371a96be0081.tar.gz | |
Merge "tox: add py35 envs for convenience"
| -rw-r--r-- | setup.cfg | 1 | ||||
| -rw-r--r-- | tox.ini | 15 |
2 files changed, 14 insertions, 2 deletions
@@ -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] @@ -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 = |