Merge "Updated from global requirements" into stable/juno
This commit is contained in:
commit
91a3387538
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue