Browse Source

Update from global requirements

Change-Id: Idb108f9253ccb4f7eeece234b027339e44779275
Ekaterina Chernova 4 years ago
parent
commit
6b8eb59dc0
3 changed files with 17 additions and 6 deletions
  1. 4
    4
      requirements.txt
  2. 8
    0
      setup.py
  3. 5
    2
      test-requirements.txt

+ 4
- 4
requirements.txt View File

@@ -4,13 +4,13 @@
4 4
 pbr>=0.6,!=0.7,<1.0
5 5
 anyjson>=0.3.3
6 6
 Babel>=1.3
7
-eventlet>=0.15.1
7
+eventlet>=0.16.1,!=0.17.0
8 8
 iso8601>=0.1.9
9 9
 kombu>=2.5.0
10
-oslo.config>=1.4.0  # Apache-2.0
10
+oslo.config>=1.9.3,<1.10.0  # Apache-2.0
11 11
 PyYAML>=3.1.0
12
-six>=1.7.0
13
-stevedore>=1.0.0  # Apache-2.0
12
+six>=1.9.0
13
+stevedore>=1.3.0,<1.4.0  # Apache-2.0
14 14
 semantic_version>=2.3.1
15 15
 
16 16
 # not listed in global requirements

+ 8
- 0
setup.py View File

@@ -17,6 +17,14 @@
17 17
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
18 18
 import setuptools
19 19
 
20
+# In python < 2.7.4, a lazy loading of package `pbr` will break
21
+# setuptools if some other modules registered functions in `atexit`.
22
+# solution from: http://bugs.python.org/issue15881#msg170215
23
+try:
24
+    import multiprocessing  # noqa
25
+except ImportError:
26
+    pass
27
+
20 28
 setuptools.setup(
21 29
     setup_requires=['pbr'],
22 30
     pbr=True)

+ 5
- 2
test-requirements.txt View File

@@ -1,8 +1,11 @@
1
+# The order of packages is significant, because pip processes them in the order
2
+# of appearance. Changing the order has an impact on the overall integration
3
+# process, which may cause wedges in the gate later.
1 4
 hacking>=0.8.0,<0.9
2 5
 unittest2
3 6
 coverage>=3.6
4 7
 discover
5 8
 mock>=1.0
6
-sphinx>=1.1.2
7
-testtools>=0.9.32
9
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
10
+testtools>=0.9.36,!=1.2.0
8 11
 testrepository>=0.0.18

Loading…
Cancel
Save