diff --git a/setup.cfg b/setup.cfg index a793bf37..3a33bb6c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -63,14 +63,5 @@ memcached = pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License ipc = sysv-ipc>=0.6.8 # BSD License -test = - mock>=2.0 # BSD - python-subunit>=0.0.18 # Apache-2.0/BSD - testtools>=1.4.0 # MIT - coverage>=3.6 # Apache-2.0 - fixtures>=3.0.0 # Apache-2.0/BSD - pifpaf>=0.10.0 # Apache-2.0 - os-testr>=0.8.0 # Apache-2.0 - stestr>=2.0.0 [wheel] universal = 1 diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..77d9ee31 --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,12 @@ + +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +mock>=2.0 # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +coverage>=3.6 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +pifpaf>=0.10.0 # Apache-2.0 +os-testr>=0.8.0 # Apache-2.0 +stestr>=2.0.0 diff --git a/tox.ini b/tox.ini index 5110fdf3..78397cb4 100644 --- a/tox.ini +++ b/tox.ini @@ -3,9 +3,9 @@ minversion = 3.1.0 envlist = py27,py36,py37,py{27,36}-{zookeeper,redis,sentinel,memcached,postgresql,mysql,consul,etcd,etcd3,etcd3gw},pep8 [testenv] -# We need to install a bit more than just `test' because those drivers have +# We need to install a bit more than just `test-requirements' because those drivers have # custom tests that we always run -deps = .[test,zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw] +deps = .[zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw] zookeeper: .[zookeeper] redis: .[redis] sentinel: .[redis] @@ -16,6 +16,7 @@ deps = .[test,zake,ipc,memcached,mysql,etcd,etcd3,etcd3gw] etcd3: .[etcd3] etcd3gw: .[etcd3gw] consul: .[consul] + -r{toxinidir}/test-requirements.txt setenv = TOOZ_TEST_URLS = file:///tmp zake:// ipc:// zookeeper: TOOZ_TEST_DRIVERS = zookeeper @@ -47,7 +48,6 @@ commands = {posargs} [testenv:cover] basepython = python3 deps = {[testenv]deps} - coverage setenv = {[testenv]setenv} PYTHON=coverage run --source tooz --parallel-mode commands =