diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2015-05-13 06:47:32 -0700 |
|---|---|---|
| committer | Matt Riedemann <mriedem@us.ibm.com> | 2015-05-13 06:47:32 -0700 |
| commit | 78984a8432663c74a5be65a92e9cf496c3a9f242 (patch) | |
| tree | 906fa17e4572f24fb94e753f659e346c1eab11f8 | |
| parent | 56c9486800a371e853056a3badd6eb11c2f88ad9 (diff) | |
| download | glance_store-78984a8432663c74a5be65a92e9cf496c3a9f242.tar.gz | |
Sync up with global-requirements
Change Ib41b0c482edf39017f26e483cd3661ca5b540133 adds glance_store to
projects.txt in the requirements repo so glance_store will start getting
automatic requirement updates when global-requirements is updated.
This is the preliminary sync for the master branch.
Closes-Bug: #1454695
Change-Id: I687ca6ee820aad2d9a19801248ae86e7198ee556
| -rw-r--r-- | requirements.txt | 21 | ||||
| -rw-r--r-- | setup.py | 8 | ||||
| -rw-r--r-- | test-requirements.txt | 19 |
3 files changed, 31 insertions, 17 deletions
diff --git a/requirements.txt b/requirements.txt index 4ea9ab6..959514b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,17 @@ -oslo.config>=1.6.0 # Apache-2.0 -oslo.i18n>=0.1.0 -oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.2.0 # Apache-2.0 -oslo.concurrency>=1.4.1 # Apache-2.0 -stevedore>=0.12 +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. +oslo.config>=1.11.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.serialization>=1.4.0 # Apache-2.0 +oslo.utils>=1.4.0 # Apache-2.0 +oslo.concurrency>=1.8.0 # Apache-2.0 +stevedore>=1.3.0 # Apache-2.0 enum34 -python-cinderclient>=1.0.6 +python-cinderclient>=1.2.1 -eventlet>=0.13.0 #s3 -six>=1.4.1 +eventlet>=0.17.3 +six>=1.9.0 jsonschema>=2.0.0,<3.0.0 @@ -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 99f2e99..c4d2b4b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,3 +1,6 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. # Metrics and style hacking>=0.10.0,<0.11 @@ -8,29 +11,29 @@ mock>=1.0 coverage>=3.6 fixtures>=0.3.14 python-subunit>=0.0.18 -requests-mock>=0.5.1 # Apache-2.0 +requests-mock>=0.6.0 # Apache-2.0 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.34 -oslotest +testtools>=0.9.36,!=1.2.0 +oslotest>=1.5.1 # Apache-2.0 # this is required for the docs build jobs -sphinx>=1.1.2,!=1.2.0,<1.3 -oslosphinx +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +oslosphinx>=2.5.0 # Apache-2.0 # # Store specific packages # # For S3 storage backend -boto>=2.12.0,!=2.13.0 +boto>=2.32.1 # For VMware storage backend. -oslo.vmware>=0.4 # Apache-2.0 +oslo.vmware>=0.11.1 # Apache-2.0 # Swift Backend httplib2>=0.7.5 -python-swiftclient>=2.0.2 +python-swiftclient>=2.2.0 # GridFS backend pymongo>=2.6.3 |