Merge "Updated from global requirements" into stable/juno

2 files changed, 38 insertions, 38 deletions

diff --git a/requirements.txt b/requirements.txt
index 88309a7aa..b3181e4f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,37 +3,37 @@
 # process, which may cause wedges in the gate later.
 pbr>=0.6,!=0.7,<1.0
 SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
-alembic>=0.6.4
-anyjson>=0.3.3
+alembic>=0.6.4,<=0.7.4
+anyjson>=0.3.3,<=0.3.3
 argparse
-eventlet>=0.15.1,<0.16.0
-kombu>=2.5.0
-lockfile>=0.8
-lxml>=2.3
-WebOb>=1.2.3
-greenlet>=0.3.2
+eventlet>=0.15.1,<=0.15.2
+kombu==3.0.7
+lockfile>=0.8,<=0.8
+lxml>=2.3,<=3.3.3
+WebOb>=1.2.3,<=1.3.1
+greenlet>=0.3.2,<=0.4.2
 sqlalchemy-migrate==0.9.1
-netaddr>=0.7.12
-paramiko>=1.13.0
-iso8601>=0.1.9
+netaddr>=0.7.12,<=0.7.13
+paramiko>=1.13.0,<=1.15.2
+iso8601>=0.1.9,<=0.1.10
 python-neutronclient>=2.3.6,<3
-python-glanceclient>=0.14.0
-python-keystoneclient>=0.10.0
-python-swiftclient>=2.2.0
-stevedore>=1.0.0  # Apache-2.0
+python-glanceclient>=0.14.0,<=0.15.0
+python-keystoneclient>=0.10.0,<=1.1.0
+python-swiftclient>=2.2.0,<=2.3.1
+stevedore>=1.0.0,<=1.2.0 # Apache-2.0
 pysendfile==2.0.0
 websockify>=0.6.0,<0.7
-oslo.config>=1.4.0  # Apache-2.0
+oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
 oslo.db>=1.0.0,<1.1  # Apache-2.0
-oslo.rootwrap>=1.3.0
-oslo.i18n>=1.0.0  # Apache-2.0
-oslo.utils>=1.0.0                       # Apache-2.0
-pecan>=0.5.0
-six>=1.7.0
-jsonpatch>=1.1
-WSME>=0.6
-Jinja2
-keystonemiddleware>=1.0.0
-oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
-retrying>=1.2.2,!=1.3.0 # Apache-2.0
-posix_ipc
+oslo.rootwrap>=1.3.0,<=1.5.0
+oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
+oslo.utils>=1.0.0,<=1.2.1 # Apache-2.0
+pecan>=0.5.0,<=0.8.3
+six>=1.7.0,<=1.9.0
+jsonpatch>=1.1,<=1.3
+WSME>=0.6,<=0.6.4
+Jinja2<=2.7.2
+keystonemiddleware>=1.0.0,<1.4.0
+oslo.messaging>=1.4.0,<1.5.0
+retrying>=1.2.2,!=1.3.0,<=1.3.3 # Apache-2.0
+posix_ipc<=0.9.9
diff --git a/test-requirements.txt b/test-requirements.txt
index 8dac22dd0..80d1e3c50 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,21 +2,21 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 hacking>=0.9.2,<0.10
-coverage>=3.6
+coverage>=3.6,<=3.7.1
 discover
-fixtures>=0.3.14
+fixtures>=0.3.14,<=1.0.0
 mock>=1.0
-Babel>=1.3
-MySQL-python
-oslotest>=1.1.0  # Apache-2.0
+Babel>=1.3,<=1.3
+MySQL-python<=1.2.3
+oslotest>=1.1.0,<1.4.0  # Apache-2.0
 psycopg2
-python-ironicclient>=0.2.1
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testtools>=0.9.34,!=1.4.0
+python-ironicclient>=0.2.1,<=0.3.3
+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
 
 # Doc requirements
 sphinx>=1.1.2,!=1.2.0,<1.3
 sphinxcontrib-pecanwsme>=0.8
-oslosphinx>=2.2.0  # Apache-2.0
+oslosphinx>=2.2.0,<2.5.0  # Apache-2.0