Merge "Updated from global requirements"
This commit is contained in:
commit
4d1c7b75a0
@ -15,16 +15,16 @@ pycrypto>=2.6
|
||||
python-ceilometerclient>=1.0.6
|
||||
python-cinderclient>=1.0.6
|
||||
python-heatclient>=0.2.3
|
||||
python-keystoneclient>=0.7.0
|
||||
python-keystoneclient>=0.8.0
|
||||
python-neutronclient>=2.3.4,<3
|
||||
python-novaclient>=2.17.0
|
||||
python-swiftclient>=1.6
|
||||
python-troveclient>=1.0.3
|
||||
python-swiftclient>=2.0.2
|
||||
python-troveclient>=1.0.4
|
||||
PyYAML>=3.1.0
|
||||
qpid-python
|
||||
requests>=1.1
|
||||
Routes>=1.12.3
|
||||
six>=1.5.2
|
||||
six>=1.6.0
|
||||
SQLAlchemy>=0.7.8,<=0.9.99
|
||||
sqlalchemy-migrate>=0.8.2,!=0.8.4
|
||||
sqlalchemy-migrate>=0.9.1
|
||||
WebOb>=1.2.3
|
||||
|
8
setup.py
8
setup.py
@ -17,6 +17,14 @@
|
||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
||||
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(
|
||||
setup_requires=['pbr'],
|
||||
pbr=True)
|
||||
|
Loading…
Reference in New Issue
Block a user