summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2016-11-08 17:47:49 -0600
committerMonty Taylor <mordred@inaugust.com>2016-11-08 17:47:49 -0600
commit15b519cc416002b9609b710b73b7ef654ffc02eb (patch)
tree16675a02b4464975dc12fad18ce849d34c07d30e
parentffe27633d00897aac25a190ade4a6ba9cd15e697 (diff)
Manual sync with global requirements
shade, oaktreemodel and grpc are not in global-requirements, so this has to be done by hand / with care. We need to remove python-*client from shade before we can put it in the global-requirements, otherwise the client lib versions will cause epic amounts of pain. So until we do that we really can't apply for official status or directly follow requirements. However, the intent is to follow them, so this will just have to be something we keep up with by hand a bit. Change-Id: Ie9fd8f121686f84b32f50371b24a247f86421b26
Notes
Notes (review): Code-Review+2: Mike Perez <thingee@gmail.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 09 Nov 2016 15:09:29 +0000 Reviewed-on: https://review.openstack.org/395258 Project: openstack/oaktree Branch: refs/heads/master
-rw-r--r--requirements.txt2
-rw-r--r--setup.py2
-rw-r--r--test-requirements.txt16
3 files changed, 10 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt
index c20dad1..884f524 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5pbr>=1.6 5pbr>=1.6 # Apache-2.0
6oaktreemodel 6oaktreemodel
7shade>=1.12.0 7shade>=1.12.0
8grpcio 8grpcio
diff --git a/setup.py b/setup.py
index 056c16c..782bb21 100644
--- a/setup.py
+++ b/setup.py
@@ -25,5 +25,5 @@ except ImportError:
25 pass 25 pass
26 26
27setuptools.setup( 27setuptools.setup(
28 setup_requires=['pbr'], 28 setup_requires=['pbr>=1.8'],
29 pbr=True) 29 pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index f4c5622..96fb1bf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,13 +2,13 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5hacking<0.13,>=0.12.0 5hacking<0.13,>=0.12.0 # Apache-2.0
6 6
7coverage>=3.6 7coverage>=4.0 # Apache-2.0
8discover 8discover # BSD
9python-subunit>=0.0.18 9python-subunit>=0.0.18 # Apache-2.0/BSD
10sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 10sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
11oslotest>=1.10.0 # Apache-2.0 11oslotest>=1.10.0 # Apache-2.0
12testrepository>=0.0.18 12testrepository>=0.0.18 # Apache-2.0/BSD
13testscenarios>=0.4 13testscenarios>=0.4 # Apache-2.0/BSD
14testtools>=1.4.0 14testtools>=1.4.0 # MIT