diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-18 00:25:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-18 00:25:15 +0000 |
| commit | 73aa8607301fea2fd4b03565617157cace91a46f (patch) | |
| tree | c116ae6abbad8928eb8615fd2667099609b76ebe | |
| parent | f5b2200acab43c85c2d375106efb16209779e796 (diff) | |
| parent | 9262525e5bc6731ecfa803d6a1ee335413e2283e (diff) | |
| download | oslo-i18n-73aa8607301fea2fd4b03565617157cace91a46f.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/requirements.txt b/requirements.txt index 6acbc28..d91c357 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ # 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 -six>=1.9.0 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 581c256..6098be6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,12 +4,12 @@ hacking<0.11,>=0.10.0 -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 -mock>=1.2 +mock>=1.2 # BSD oslotest>=1.10.0 # Apache-2.0 -coverage>=3.6 +coverage>=3.6 # Apache-2.0 # for pre-release tests oslo.config>=3.2.0 # Apache-2.0 |