diff options
| -rw-r--r-- | requirements.txt | 14 | ||||
| -rwxr-xr-x | setup.py | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 2 |
3 files changed, 16 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt index 500f9762..f4a212df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,25 +12,25 @@ lxml>=2.3 msgpack-python netaddr>=0.7.6 oslo.config>=1.2.0 -oslo.vmware>=0.2 # Apache-2.0 +oslo.vmware>=0.3 # Apache-2.0 PasteDeploy>=1.5.0 -pbr>=0.6,<1.0 +pbr>=0.6,!=0.7,<1.0 pecan>=0.4.5 posix_ipc oslo.messaging>=1.3.0 pysnmp>=4.2.1,<5.0.0 python-ceilometerclient>=1.0.6 python-glanceclient>=0.9.0 -python-keystoneclient>=0.7.0 -python-novaclient>=2.17.0 -python-swiftclient>=1.6 +python-keystoneclient>=0.8.0 python-neutronclient>=2.3.4,<3 +python-novaclient>=2.17.0 +python-swiftclient>=2.0.2 pytz>=2010h PyYAML>=3.1.0 requests>=1.1 -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 stevedore>=0.14 WebOb>=1.2.3 WSME>=0.6 @@ -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) diff --git a/test-requirements.txt b/test-requirements.txt index c673e3f8..3da7ff72 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,7 +17,7 @@ python-subunit>=0.0.18 sphinx>=1.1.2,<1.2 sphinxcontrib-docbookrestapi sphinxcontrib-httpdomain -sphinxcontrib-pecanwsme>=0.6 +sphinxcontrib-pecanwsme>=0.8 testrepository>=0.0.18 testscenarios>=0.4 testtools>=0.9.34 |