Browse Source

Update requirements manually

The global requirments sync for this repo fails since it lists
packages that are not in the global list. Manually sync
requirements.

Failure log from requirements sync:
http://logs.openstack.org/d8/d89aad257d43fe02e42e44b2a0187dbd9f505c36/post/propose-update-requirements/15a7777/job-output.txt.gz#_2018-01-31_06_51_56_655451

Errors are:
'discover' is not in global-requirements.txt or blacklist.txt
'dpath' is not in global-requirements.txt or blacklist.txt
'salt' is not in global-requirements.txt or blacklist.txt
'yamllint' is not in global-requirements.txt or blacklist.txt

Change-Id: Ifbd174d568b0cae5225faa6e25b1bc5fc4774e6e
tags/1.5.3^0
Andreas Jaeger 1 year ago
parent
commit
ad804626c4
3 changed files with 35 additions and 18 deletions
  1. 3
    0
      requirements.txt
  2. 13
    2
      setup.py
  3. 19
    16
      test-requirements.txt

+ 3
- 0
requirements.txt View File

@@ -0,0 +1,3 @@
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.

+ 13
- 2
setup.py View File

@@ -1,4 +1,5 @@
1
-#!/usr/bin/env python
1
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
2
+#
2 3
 # Licensed under the Apache License, Version 2.0 (the "License");
3 4
 # you may not use this file except in compliance with the License.
4 5
 # You may obtain a copy of the License at
@@ -11,8 +12,18 @@
11 12
 # implied.
12 13
 # See the License for the specific language governing permissions and
13 14
 # limitations under the License.
15
+
16
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
14 17
 import setuptools
15 18
 
19
+# In python < 2.7.4, a lazy loading of package `pbr` will break
20
+# setuptools if some other modules registered functions in `atexit`.
21
+# solution from: http://bugs.python.org/issue15881#msg170215
22
+try:
23
+    import multiprocessing  # noqa
24
+except ImportError:
25
+    pass
26
+
16 27
 setuptools.setup(
17
-    setup_requires=['pbr'],
28
+    setup_requires=['pbr>=2.0.0'],
18 29
     pbr=True)

+ 19
- 16
test-requirements.txt View File

@@ -1,23 +1,26 @@
1
-coverage>=4.0  # Apache-2.0
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.
4
+coverage!=4.4,>=4.0 # Apache-2.0
2 5
 discover
3 6
 dpath>=1.3.2
4
-fixtures>=3.0.0  # Apache-2.0/BSD
7
+fixtures>=3.0.0 # Apache-2.0/BSD
5 8
 # Hacking already pins down pep8, pyflakes and flake8
6
-hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
7
-mock>=2.0  # BSD
8
-openstackdocstheme>=1.11.0 # Apache-2.0
9
-paunch>=1.0.0  # Apache-2.0
9
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
10
+mock>=2.0.0 # BSD
11
+openstackdocstheme>=1.18.1 # Apache-2.0
12
+paunch>=1.0.0 # Apache-2.0
10 13
 reno>=2.5.0 # Apache-2.0
11
-requests>=2.10.0,!=2.12.2,!=2.13.0  # Apache-2.0
12
-requests-mock>=1.1  # Apache-2.0
14
+requests>=2.14.2 # Apache-2.0
15
+requests-mock>=1.1.0 # Apache-2.0
13 16
 salt
14
-sphinx>=1.6.2 # BSD
15
-testrepository>=0.0.18
16
-testscenarios>=0.4
17
-testtools>=1.4.0  # MIT
17
+sphinx!=1.6.6,>=1.6.2 # BSD
18
+testrepository>=0.0.18 # Apache-2.0/BSD
19
+testscenarios>=0.4 # Apache-2.0/BSD
20
+testtools>=2.2.0 # MIT
18 21
 yamllint>=1.2.0
19
-os-apply-config  # Apache-2.0
22
+os-apply-config>=5.0.0 # Apache-2.0
20 23
 
21
-python-heatclient>=1.6.1  # Apache-2.0
22
-python-keystoneclient>=3.8.0  # Apache-2.0
23
-python-openstackclient>=3.3.0  # Apache-2.0
24
+python-heatclient>=1.10.0 # Apache-2.0
25
+python-keystoneclient>=3.8.0 # Apache-2.0
26
+python-openstackclient>=3.12.0 # Apache-2.0

Loading…
Cancel
Save