diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-02-07 08:10:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-02-07 08:10:31 +0000 |
commit | 1c16d18ff60c11a8eb49693384fea2f5f957fea0 (patch) | |
tree | 30a3fb9e70c6a170b0aa6d3c69f79153143ccb8d | |
parent | 5d140b792358266c948d85a2baec4bac1835b5e3 (diff) | |
parent | c07ee616ae1d7e1a212dd17ba1f16a177c7acf3d (diff) | |
download | keystonemiddleware-1c16d18ff60c11a8eb49693384fea2f5f957fea0.tar.gz |
Merge "Add python-memcached to test-requirements"
-rw-r--r-- | test-requirements-py3.txt | 18 | ||||
-rw-r--r-- | test-requirements.txt | 1 | ||||
-rw-r--r-- | tox.ini | 8 |
3 files changed, 27 insertions, 0 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt new file mode 100644 index 0000000..778f68a --- /dev/null +++ b/test-requirements-py3.txt @@ -0,0 +1,18 @@ +# 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. + +coverage>=3.6 +discover +fixtures>=0.3.14 +hacking>=0.8.0,<0.9 +mock>=1.0 +pycrypto>=2.6 +oslosphinx>=2.2.0 # Apache-2.0 +oslotest>=1.2.0 # Apache-2.0 +oslo.messaging>=1.4.0,!=1.5.0 +requests-mock>=0.5.1 # Apache-2.0 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +testrepository>=0.0.18 +testresources>=0.2.4 +testtools>=0.9.36,!=1.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e6e02b0..55d21d5 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,3 +17,4 @@ sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 testrepository>=0.0.18 testresources>=0.2.4 testtools>=0.9.36,!=1.2.0 +python-memcached>=1.48 @@ -14,6 +14,14 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = python setup.py testr --testr-args='{posargs}' +[testenv:py33] +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements-py3.txt + +[testenv:py34] +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements-py3.txt + [testenv:pep8] commands = flake8 |