summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Podoliaka <rpodolyaka@mirantis.com>2016-07-04 17:31:18 +0300
committerRoman Podoliaka <rpodolyaka@mirantis.com>2016-07-07 08:02:11 +0300
commit72bab42e00f7c72bea74e92a044d942f8769a9a3 (patch)
tree1f626669a7b5d108e13b74cb9656470315bbc151
parent3e3db134c0cb33b3626aedae8a74142e661d9910 (diff)
downloadoslo-db-72bab42e00f7c72bea74e92a044d942f8769a9a3.tar.gz
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
-rw-r--r--setup.cfg1
-rw-r--r--tox.ini15
2 files changed, 14 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index bcfcc84..7632a41 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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]
diff --git a/tox.ini b/tox.ini
index 0fa4621..1c095cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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 =