From d34e6f1537e32493d04aece4f6d223c694f52642 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Mon, 3 Oct 2016 17:41:44 +0300
Subject: [PATCH] Sync with global requirements

Also add local constraints file to pin requests package to unblock the
gate.

Change-Id: I1c243803bc2e7af49df91dc914791bf0ef338106
---
 constraints.txt       | 2 ++
 requirements.txt      | 8 ++++----
 test-requirements.txt | 4 ++--
 tox.ini               | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 constraints.txt

diff --git a/constraints.txt b/constraints.txt
new file mode 100644
index 00000000..b60e5ac3
--- /dev/null
+++ b/constraints.txt
@@ -0,0 +1,2 @@
+# Pin versions of packages that behave badly only for us
+requests===2.10.0
diff --git a/requirements.txt b/requirements.txt
index c96dae30..44f582b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,15 +4,15 @@
 
 pbr>=1.6 # Apache-2.0
 
-cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
+cliff>=2.2.0 # Apache-2.0
 futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
-docker-py<1.8.0,>=1.6.0 # Apache-2.0
+docker-py!=1.8.0,>=1.6.0 # Apache-2.0
 GitPython>=1.0.1 # BSD License (3 clause)
 Jinja2>=2.8 # BSD License (3 clause)
 jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
-PyYAML>=3.1.0 # MIT
+PyYAML>=3.10.0 # MIT
 six>=1.9.0 # MIT
 keystoneauth1>=2.10.0 # Apache-2.0
-pykube
+pykube # Apache-2.0
 python-neutronclient>=5.1.0 # Apache-2.0
 python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 24332582..444ef9bd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,8 +8,8 @@ bashate>=0.2 # Apache-2.0
 coverage>=3.6 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
-sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
-oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index f725310a..5fcaaae5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = False
 
 [testenv]
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
+install_command = pip install -c {toxinidir}/constraints.txt -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps =