summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-12 13:17:01 +0000
committerGerrit Code Review <review@openstack.org>2014-12-12 13:17:01 +0000
commit6400bef55c0bdef13a47d4d89b62a2c73d3ae3b4 (patch)
tree35c350add3c45ba28e5f72fe426eff7ef111023d
parent7c7493feb53429577efca2c4b0380af03ddc149b (diff)
parent32bf9400e6479b0c8a0fda5a845277d033c9ac2b (diff)
downloadoslo-concurrency-6400bef55c0bdef13a47d4d89b62a2c73d3ae3b4.tar.gz
Merge "Drop requirements-py3.txt"
-rw-r--r--requirements-py3.txt14
-rw-r--r--tox.ini4
2 files changed, 0 insertions, 18 deletions
diff --git a/requirements-py3.txt b/requirements-py3.txt
deleted file mode 100644
index 5e14b6f..0000000
--- a/requirements-py3.txt
+++ /dev/null
@@ -1,14 +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.
-
-pbr>=0.6,!=0.7,<1.0
-Babel>=1.3
-iso8601>=0.1.9
-fixtures>=0.3.14
-oslo.config>=1.4.0 # Apache-2.0
-oslo.i18n>=1.0.0 # Apache-2.0
-oslo.utils>=1.1.0 # Apache-2.0
-posix_ipc
-six>=1.7.0
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index d14cd1a..e6e2296 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,14 +20,10 @@ commands =
env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
[testenv:py33]
-deps = -r{toxinidir}/requirements-py3.txt
- -r{toxinidir}/test-requirements.txt
commands =
lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'
[testenv:py34]
-deps = -r{toxinidir}/requirements-py3.txt
- -r{toxinidir}/test-requirements.txt
commands =
lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}'