diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-01-18 13:25:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-01-18 13:25:23 +0000 |
commit | b8448c2f79b53af3475198ab88f9abf0c698e2c7 (patch) | |
tree | 464ad8e29b5cca00852c0d43ca2d95c9a61523fe | |
parent | 42697d8311d9dce11942827623c3ebb58c98815e (diff) | |
parent | 3b97ab9411a5037eb6b1469478a871758c676cff (diff) | |
download | glance_store-b8448c2f79b53af3475198ab88f9abf0c698e2c7.tar.gz |
Merge "Updated from global requirements"
-rw-r--r-- | requirements.txt | 8 | ||||
-rw-r--r-- | setup.cfg | 10 | ||||
-rw-r--r-- | test-requirements.txt | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/requirements.txt b/requirements.txt index 64a7cc4..3890d1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,9 +7,9 @@ oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 oslo.concurrency>=2.3.0 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD -eventlet>=0.17.4 -six>=1.9.0 +eventlet>=0.17.4 # MIT +six>=1.9.0 # MIT -jsonschema!=2.5.0,<3.0.0,>=2.0.0 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT @@ -55,16 +55,16 @@ oslo.config.opts = [extras] # Dependencies for each of the optional stores s3 = - boto>=2.32.1 + boto>=2.32.1 # MIT vmware = oslo.vmware>=1.16.0 # Apache-2.0 swift = - httplib2>=0.7.5 - python-swiftclient>=2.2.0 + httplib2>=0.7.5 # MIT + python-swiftclient>=2.2.0 # Apache-2.0 gridfs = - pymongo>=3.0.2 + pymongo>=3.0.2 # Apache-2.0 cinder = - python-cinderclient>=1.3.1 + python-cinderclient>=1.3.1 # Apache-2.0 [build_sphinx] source-dir = doc/source diff --git a/test-requirements.txt b/test-requirements.txt index 38ff8c6..8c6627d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,19 +5,19 @@ hacking<0.11,>=0.10.0 # Packaging -mock>=1.2 +mock>=1.2 # BSD # Unit testing -coverage>=3.6 -fixtures>=1.3.1 -python-subunit>=0.0.18 +coverage>=3.6 # Apache-2.0 +fixtures>=1.3.1 # Apache-2.0/BSD +python-subunit>=0.0.18 # Apache-2.0/BSD requests-mock>=0.7.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT oslotest>=1.10.0 # Apache-2.0 # this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 reno>=0.1.1 # Apache2 |