diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-04-09 18:42:52 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-04-09 18:42:52 +0000 |
commit | 91a33875385ca296d24f67d4ef9629a2b33bed99 (patch) | |
tree | a57d2a3df06b34129740b984a056f92181c0bd80 | |
parent | e2bbebe0083e6d6b3fa39c5895bee15965da1ea3 (diff) | |
parent | 8afaf2770382d06cc429ae600afbcbe7efc18034 (diff) | |
download | keystone-91a33875385ca296d24f67d4ef9629a2b33bed99.tar.gz |
Merge "Updated from global requirements" into stable/juno2014.2.3
-rw-r--r-- | test-requirements-py3.txt | 10 | ||||
-rw-r--r-- | test-requirements.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt index 9fc350bb8..057eabd93 100644 --- a/test-requirements-py3.txt +++ b/test-requirements-py3.txt @@ -14,7 +14,7 @@ bashate>=0.2 # Apache-2.0 # python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.5 +pymongo>=2.5,<3.0 # Optional backend: LDAP # python-ldap does not install on py3 @@ -30,7 +30,7 @@ fixtures>=0.3.14,<=1.0.0 # xml parsing lxml>=2.3,<=3.3.3 # mock object framework -mock>=1.0 +mock>=1.0,<=1.0.1 oslotest>=1.1.0,<1.4.0 # Apache-2.0 # required to build documentation sphinx>=1.1.2,!=1.2.0,<1.3 @@ -41,16 +41,16 @@ WebTest>=2.0,<=2.0.18 # discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html #mox>=0.5.3 -discover +discover<=0.4.0 python-subunit>=0.0.18,<=1.0.0 testrepository>=0.0.18,<=0.0.20 testtools>=0.9.34,!=1.4.0,<=1.5.0 -testscenarios>=0.4 +testscenarios>=0.4,<=0.4 # For documentation oslosphinx>=2.2.0,<2.5.0 # Apache-2.0 # Used only by oslo -kombu==3.0.7 +kombu>=2.5.0,<=3.0.7 lockfile>=0.8,<=0.8 stevedore>=1.0.0,<=1.2.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 721eee7e4..f1aefbd5f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -12,7 +12,7 @@ pysqlite<=2.6.3 python-memcached>=1.48 # Optional dogpile backend: MongoDB -pymongo>=2.5 +pymongo>=2.5,<3.0 # Optional backend: LDAP # authenticate against an existing LDAP server @@ -31,7 +31,7 @@ fixtures>=0.3.14,<=1.0.0 # xml parsing lxml>=2.3,<=3.3.3 # mock object framework -mock>=1.0 +mock>=1.0,<=1.0.1 oslotest>=1.1.0,<1.4.0 # Apache-2.0 # required to build documentation sphinx>=1.1.2,!=1.2.0,<1.3 @@ -42,16 +42,16 @@ WebTest>=2.0,<=2.0.18 # discussion: http://lists.openstack.org/pipermail/openstack-dev/2013-July/012484.html #mox>=0.5.3 -discover +discover<=0.4.0 python-subunit>=0.0.18,<=1.0.0 testrepository>=0.0.18,<=0.0.20 testtools>=0.9.34,!=1.4.0,<=1.5.0 -testscenarios>=0.4 +testscenarios>=0.4,<=0.4 # For documentation oslosphinx>=2.2.0,<2.5.0 # Apache-2.0 # Used only by oslo -kombu==3.0.7 +kombu>=2.5.0,<=3.0.7 lockfile>=0.8,<=0.8 stevedore>=1.0.0,<=1.2.0 # Apache-2.0 |