From 97b936debc02755f1d09ed625bae98bc3d514c4c Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Wed, 1 Jul 2015 22:54:49 +0300 Subject: [PATCH] Remove test-requirements-py3.txt eventlet is already available for Python 3.x so no reason to keep requirements for Python 3.x special. This should also fix failing I98a0fa6. Change-Id: Ib56f93f6749846c730c9a765217f3d15df4a6971 --- test-requirements-py3.txt | 27 --------------------------- tox.ini | 6 ++---- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 test-requirements-py3.txt diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt deleted file mode 100644 index aee21a1..0000000 --- a/test-requirements-py3.txt +++ /dev/null @@ -1,27 +0,0 @@ -# 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. - -hacking<0.11,>=0.10.0 - -discover -fixtures>=0.3.14 -python-subunit>=0.0.18 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 - -# when we can require tox>= 1.4, this can go into tox.ini: -# [testenv:cover] -# deps = {[testenv]deps} coverage -coverage>=3.6 - -# mocking framework -mock>=1.0 - -# rootwrap daemon's client should be verified to run in eventlet -# not available for Python 3.x -# eventlet>=0.13.0 - -oslotest>=1.5.1 # Apache-2.0 - diff --git a/tox.ini b/tox.ini index ec3165f..d7853b2 100644 --- a/tox.ini +++ b/tox.ini @@ -17,9 +17,7 @@ commands = env TEST_EVENTLET=1 python setup.py testr --slowest --testr-args='tests.test_functional_eventlet' [testenv:py33] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements-py3.txt -# Eventlet is not available here +# Eventlet tests does not work yet here commands = python setup.py testr --slowest --testr-args='{posargs}' @@ -53,4 +51,4 @@ commands = python benchmark/benchmark.py # this also means that pip-missing-reqs must be installed separately, outside # of the requirements.txt files deps = pip_missing_reqs -commands = pip-missing-reqs -d --ignore-module=oslo_rootwrap* --ignore-module=pkg_resources --ignore-file=oslo_rootwrap/test.py --ignore-file=oslo_rootwrap/tests/* oslo_rootwrap \ No newline at end of file +commands = pip-missing-reqs -d --ignore-module=oslo_rootwrap* --ignore-module=pkg_resources --ignore-file=oslo_rootwrap/test.py --ignore-file=oslo_rootwrap/tests/* oslo_rootwrap