summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2016-01-16 03:26:15 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2016-01-16 03:26:15 +0000
commit3b97ab9411a5037eb6b1469478a871758c676cff (patch)
tree9c0722ebad72ec69fbff42784a2598316ab787a8
parent399aec1f81853d66c8319405c9170ac69e346e78 (diff)
downloadglance_store-3b97ab9411a5037eb6b1469478a871758c676cff.tar.gz
Updated from global requirements
Change-Id: Ie59dd20ed5a369b86c9ae7ad160f2ef8ef04b6c6
-rw-r--r--requirements.txt8
-rw-r--r--setup.cfg10
-rw-r--r--test-requirements.txt16
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
diff --git a/setup.cfg b/setup.cfg
index b989627..f169b30 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -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