openstack
/
tooz
Code Issues Proposed changes

Switch from Python 3.4 to Python 3.5 

Change-Id: Iacf2a84d775ded1d67bf540ad0afc4bcf2066f14
This commit is contained in:
Julien Danjou 2016-09-12 14:09:41 +02:00
parent 05c89c0e10
commit 65d8c09148
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.cfg
View File

@ -16,7 +16,7 @@ classifier =
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Topic :: System :: Distributed Computing
[files]

42
tox.ini
View File

@ -1,19 +1,19 @@
[tox]
minversion = 1.8
envlist = py27,py34,py27-zookeeper,py34-zookeeper,py27-redis,py34-redis,py27-sentinel,py34-sentinel,py27-memcached,py34-memcached,py27-postgresql,py34-postgresql,py27-mysql,py34-mysql,py27-consul,py34-consul,pep8
envlist = py27,py35,py27-zookeeper,py35-zookeeper,py27-redis,py35-redis,py27-sentinel,py35-sentinel,py27-memcached,py35-memcached,py27-postgresql,py35-postgresql,py27-mysql,py35-mysql,py27-consul,py35-consul,pep8
[testenv]
# We need to install a bit more than just `test' because those drivers have
# custom tests that we always run
deps = .[test,zake,ipc,memcached,mysql,etcd]
py{27,34}-zookeeper: .[zookeeper]
py{27,34}-redis: .[redis]
py{27,34}-sentinel: .[redis]
py{27,34}-memcached: .[memcached]
py{27,34}-postgresql: .[postgresql]
py{27,34}-mysql: .[mysql]
py{27,34}-etcd: .[etcd]
py{27,34}-consul: .[consul]
zookeeper: .[zookeeper]
redis: .[redis]
sentinel: .[redis]
memcached: .[memcached]
postgresql: .[postgresql]
mysql: .[mysql]
etcd: .[etcd]
consul: .[consul]
commands = python setup.py testr --slowest --testr-args="{posargs}"
[testenv:venv]
@ -28,57 +28,49 @@ commands = python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-zookeeper]
commands = pifpaf -e TOOZ_TEST run zookeeper -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-zookeeper]
basepython = python3.4
[testenv:py35-zookeeper]
commands = pifpaf -e TOOZ_TEST run zookeeper -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-redis]
commands = pifpaf -e TOOZ_TEST run redis -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-redis]
basepython = python3.4
[testenv:py35-redis]
commands = pifpaf -e TOOZ_TEST run redis -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-sentinel]
commands = pifpaf -e TOOZ_TEST run redis --sentinel -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-sentinel]
basepython = python3.4
[testenv:py35-sentinel]
commands = pifpaf -e TOOZ_TEST run redis --sentinel -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-memcached]
commands = pifpaf -e TOOZ_TEST run memcached -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-memcached]
basepython = python3.4
[testenv:py35-memcached]
commands = pifpaf -e TOOZ_TEST run memcached -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-postgresql]
commands = pifpaf -e TOOZ_TEST run postgresql -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-postgresql]
basepython = python3.4
[testenv:py35-postgresql]
commands = pifpaf -e TOOZ_TEST run postgresql -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-mysql]
commands = pifpaf -e TOOZ_TEST run mysql -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-mysql]
basepython = python3.4
[testenv:py35-mysql]
commands = pifpaf -e TOOZ_TEST run mysql -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-etcd]
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-etcd]
basepython = python3.4
[testenv:py35-etcd]
commands = {toxinidir}/setup-etcd-env.sh pifpaf -g TOOZ_TEST run etcd -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py27-consul]
commands = {toxinidir}/setup-consul-env.sh pifpaf -g TOOZ_TEST run consul -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:py34-consul]
basepython = python3.4
[testenv:py35-consul]
commands = {toxinidir}/setup-consul-env.sh pifpaf -g TOOZ_TEST run consul -- python setup.py testr --slowest --testr-args="{posargs}"
[testenv:cover]