Updated from global requirements

Change-Id: I0865dd73e4c6936cb0935edab34893d377dd040a
This commit is contained in:
OpenStack Proposal Bot 2015-09-03 04:12:46 +00:00
parent 8a98a6446d
commit 4fda4a749f
3 changed files with 24 additions and 17 deletions

View File

@ -2,12 +2,12 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0 pbr<2.0,>=1.6
Babel>=1.3 Babel>=1.3
cryptography>=0.9.1 # Apache-2.0 cryptography>=1.0 # Apache-2.0
oslo.config>=1.9.3,<1.10.0 # Apache-2.0 oslo.config>=2.3.0 # Apache-2.0
oslo.context>=0.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0
oslo.log>=1.0.0,<1.1.0 # Apache-2.0 oslo.log>=1.8.0 # Apache-2.0
oslo.policy>=0.3.1,<0.4.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 oslo.utils>=2.0.0 # Apache-2.0

11
setup.py Executable file → Normal file
View File

@ -1,4 +1,3 @@
#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@ -17,6 +16,14 @@
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=1.3'],
pbr=True) pbr=True)

View File

@ -2,15 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
hacking>=0.9.2,<0.10 hacking<0.10,>=0.9.2
coverage>=3.6 coverage>=3.6
discover discover
python-barbicanclient>=3.0.1 python-barbicanclient>=3.3.0
python-subunit python-subunit>=0.0.18
sphinx>=1.1.2 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.1.0.0a1 oslotest>=1.10.0 # Apache-2.0
testrepository>=0.0.18 testrepository>=0.0.18
testscenarios>=0.4 testscenarios>=0.4
testtools>=0.9.34 testtools>=1.4.0