Browse Source

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
master
Monty Taylor 2 years ago
parent
commit
15b519cc41
No account linked to committer's email address
3 changed files with 10 additions and 10 deletions
  1. 1
    1
      requirements.txt
  2. 1
    1
      setup.py
  3. 8
    8
      test-requirements.txt

+ 1
- 1
requirements.txt View File

@@ -2,7 +2,7 @@
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4 4
 
5
-pbr>=1.6
5
+pbr>=1.6 # Apache-2.0
6 6
 oaktreemodel
7 7
 shade>=1.12.0
8 8
 grpcio

+ 1
- 1
setup.py View File

@@ -25,5 +25,5 @@ except ImportError:
25 25
     pass
26 26
 
27 27
 setuptools.setup(
28
-    setup_requires=['pbr'],
28
+    setup_requires=['pbr>=1.8'],
29 29
     pbr=True)

+ 8
- 8
test-requirements.txt View File

@@ -2,13 +2,13 @@
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4 4
 
5
-hacking<0.13,>=0.12.0
5
+hacking<0.13,>=0.12.0  # Apache-2.0
6 6
 
7
-coverage>=3.6
8
-discover
9
-python-subunit>=0.0.18
10
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
7
+coverage>=4.0 # Apache-2.0
8
+discover # BSD
9
+python-subunit>=0.0.18 # Apache-2.0/BSD
10
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
11 11
 oslotest>=1.10.0 # Apache-2.0
12
-testrepository>=0.0.18
13
-testscenarios>=0.4
14
-testtools>=1.4.0
12
+testrepository>=0.0.18 # Apache-2.0/BSD
13
+testscenarios>=0.4 # Apache-2.0/BSD
14
+testtools>=1.4.0 # MIT

Loading…
Cancel
Save