Merge "Updated from global requirements"
diff --git a/requirements.txt b/requirements.txt
index 99f48af..1042c2f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,12 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=2.0 # Apache-2.0
+pbr!=2.1.0,>=2.0.0 # Apache-2.0
# xml parsing
-lxml!=3.7.0,>=2.3 # BSD
-tempest>=12.1.0 # Apache-2.0
-oslo.config>=3.22.0 # Apache-2.0
-testtools>=1.4.0 # MIT
-six>=1.9.0
+lxml!=3.7.0,>=3.4.1 # BSD
+tempest>=17.1.0 # Apache-2.0
+oslo.config>=5.1.0 # Apache-2.0
+testtools>=2.2.0 # MIT
+six>=1.10.0 # MIT
requests>=2.14.2 # Apache-2.0
diff --git a/setup.py b/setup.py
index 3887303..566d844 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@
pass
setuptools.setup(
- setup_requires=['pbr>=2.0'],
+ setup_requires=['pbr>=2.0.0'],
pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index b2051c9..6eae4b7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-hacking>=0.12.0,<0.13 # Apache-2.0
+hacking<0.13,>=0.12.0 # Apache-2.0
-sphinx!=1.6.1,>=1.5.1 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
# releasenotes
-reno>=1.8.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0