diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-16 10:34:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-16 10:34:50 +0000 |
| commit | 08d06770181c65c255ba6f09121e75703503b82f (patch) | |
| tree | f924ca3b8c03b98b13ecab3e7261751bf717e735 | |
| parent | fec46db26312185e2269101b71045d45267633e6 (diff) | |
| parent | ca9801d4e455bd642e1d24c951cddc4f283d118a (diff) | |
| download | oslo-concurrency-08d06770181c65c255ba6f09121e75703503b82f.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 10 | ||||
| -rw-r--r-- | test-requirements.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/requirements.txt b/requirements.txt index ae213e5..a66e770 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,13 +2,13 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 -Babel>=1.3 -enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' -iso8601>=0.1.9 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD +enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD +iso8601>=0.1.9 # MIT oslo.config>=3.2.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -six>=1.9.0 +six>=1.9.0 # MIT fasteners>=0.7 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index d7b0033..71ff738 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,12 +4,12 @@ hacking<0.11,>=0.10.0 oslotest>=1.10.0 # Apache-2.0 -coverage>=3.6 -futures>=3.0;python_version=='2.7' or python_version=='2.6' -fixtures>=1.3.1 +coverage>=3.6 # Apache-2.0 +futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD +fixtures>=1.3.1 # Apache-2.0/BSD # These are needed for docs generation oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD -eventlet>=0.17.4 +eventlet>=0.17.4 # MIT |