diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 04:34:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 04:34:58 +0000 |
| commit | e9d11380ca956a3d87ea63813d1366fce78b5551 (patch) | |
| tree | 8bdfec2f941536175d086cfc32e71e9921460654 | |
| parent | 500e6129aee983cacaacbd48d0a706323e54bc71 (diff) | |
| parent | ad94135e3574124db4399dd6785893e9e313fa4f (diff) | |
| download | python-ceilometerclient-e9d11380ca956a3d87ea63813d1366fce78b5551.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 18 | ||||
| -rw-r--r-- | test-requirements.txt | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/requirements.txt b/requirements.txt index 66bee05..85ce164 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ # 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. -pbr>=1.6 -argparse -iso8601>=0.1.9 -keystoneauth1>=2.1.0 +pbr>=1.6 # Apache-2.0 +argparse # PSF +iso8601>=0.1.9 # MIT +keystoneauth1>=2.1.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -oslo.utils>=3.2.0 # Apache-2.0 -PrettyTable<0.8,>=0.7 -python-keystoneclient!=1.8.0,>=1.6.0 -requests!=2.9.0,>=2.8.1 -six>=1.9.0 +oslo.utils>=3.4.0 # Apache-2.0 +PrettyTable<0.8,>=0.7 # BSD +python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 301c3c9..8641064 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,13 +3,13 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 hacking<0.11,>=0.10.0 -coverage>=3.6 -discover -fixtures>=1.3.1 -mock>=1.2 +coverage>=3.6 # Apache-2.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -python-subunit>=0.0.18 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -tempest-lib>=0.13.0 -testrepository>=0.0.18 -testtools>=1.4.0 +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +tempest-lib>=0.13.0 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT |