summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Martinelli <stevemar@ca.ibm.com>2015-02-06 01:31:01 -0500
committerSteve Martinelli <stevemar@ca.ibm.com>2015-02-06 01:53:50 -0500
commitc91842de47b3424a685adc57b4bded7b5b617dba (patch)
treed754f5f726dad78ff2324f52b04251de600fe628
parent1adfc5f315e65edb4e72fc3267b4bd2d57298dda (diff)
downloadoslo-policy-c91842de47b3424a685adc57b4bded7b5b617dba.tar.gz
Remove oslo.concurrency from requirements
This was only being used in a test, which has since been refactored to not need lockutils, as such we can remove oslo.concurrency from this requirements list. Also remove a reference of it from tox.ini Change-Id: I3da48a5a99db126637d78a5eadfa44da594b82c2
-rw-r--r--requirements.txt1
-rw-r--r--tox.ini8
2 files changed, 2 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt
index 6cadd84..1782a99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-oslo.concurrency>=1.4.1 # Apache-2.0
oslo.config>=1.6.0 # Apache-2.0
oslo.i18n>=1.3.0 # Apache-2.0
oslo.log>=0.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 0a667cc..c46cd3b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,9 +14,7 @@ setenv =
VIRTUAL_ENV={envdir}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands =
- # Use the lockutils wrapper to ensure that external locking works correctly
- lockutils-wrapper python setup.py test --slowest --testr-args='{posargs}'
+commands = python setup.py testr --slowest --testr-args='{posargs}'
[testenv:pep8]
commands = flake8
@@ -28,9 +26,7 @@ commands = {posargs}
commands = python setup.py build_sphinx
[testenv:cover]
-commands =
- # Use the lockutils wrapper to ensure that external locking works correctly
- lockutils-wrapper python setup.py test --coverage --testr-args='{posargs}'
+commands = python setup.py testr --coverage
[flake8]
# H803 skipped on purpose per list discussion.