Merge "Use global-requirements for requirements"

.zuul.yaml

@@ -28,6 +28,7 @@
 
 - project:
     templates:
+      - check-requirements
       - openstack-cover-jobs
       - openstack-python-jobs
       - openstack-python35-jobs

doc/requirements.txt

@@ -3,5 +3,5 @@
 # process, which may cause wedges in the gate later.
 
 openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-reno>=2.5.0  # Apache2
+sphinx>=1.6.2,!=1.6.6,!=1.6.7 # BSD
+reno>=2.5.0 # Apache-2.0

lower-constraints.txt

@@ -0,0 +1,23 @@
+# requirements
+pbr==2.0.0 # Apache-2.0
+cliff==2.11.0 # Apache-2.0
+keystoneauth1==3.4.0 # Apache-2.0
+oslo.utils==3.35 # Apache-2.0
+oslo.log==3.36 # Apache-2.0
+PyYAML==3.12 # MIT
+jsonpath-rw-ext==1.0 # Apache-2.0
+six==1.11 # MIT
+os-client-config==1.29.0 # Apache-2.0
+
+# test-requirements.txt
+coverage==4.0 # Apache-2.0
+python-subunit==0.0.18 # Apache-2.0/BSD
+oslotest==1.10.0 # Apache-2.0
+stestr==2.0 # Apache-2.0
+mock==2.0 # BSD
+python-openstackclient==3.14 # Apache-2.0
+
+# doc/requirements.txt
+openstackdocstheme==1.18.1 # Apache-2.0
+sphinx==1.6.2 # BSD
+reno==2.5.0  # Apache2

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.1.0,>=2.0.0 # Apache-2.0
-cliff>=2.11.0,<3.0 # Apache-2.0
-keystoneauth1>=3.4.0,<4.0 # Apache-2.0
-oslo.utils>=3.35,<4.0 # Apache-2.0
-oslo.log>=3.36,<4.0 # Apache-2.0
-PyYAML>=3.12,<4.0 # MIT
+pbr>=2.0.0,!=2.1.0 # Apache-2.0
+cliff>=2.11.0 # Apache-2.0
+keystoneauth1>=3.4.0 # Apache-2.0
+oslo.utils>=3.35 # Apache-2.0
+oslo.log>=3.36 # Apache-2.0
+PyYAML>=3.12 # MIT
 jsonpath-rw-ext>=1.0 # Apache-2.0
-six>=1.11,<2.0 # MIT
+six>=1.11 # MIT
 os-client-config>=1.29.0 # Apache-2.0

test-requirements.txt

@@ -4,7 +4,7 @@
 
 hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-coverage!=4.4,>=4.0 # Apache-2.0
+coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
 oslotest>=1.10.0 # Apache-2.0
 stestr>=2.0 # Apache-2.0