diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-13 20:25:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-13 20:25:51 +0000 |
| commit | 2ff6a70663f7b08b0c1429e4725b9c4f02e048fe (patch) | |
| tree | ff5f44a3ce4efa9f2d93842d77f32d02b25301bb | |
| parent | d4cf5d3dd597127d6b38c6ee38b0c9d66faae871 (diff) | |
| parent | 230906f021dc34b39bd50746ae8702a5e87d9c24 (diff) | |
| download | python-designateclient-2ff6a70663f7b08b0c1429e4725b9c4f02e048fe.tar.gz | |
Merge "Updated from global requirements"
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt index ef61355..f834e9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ osc-lib>=1.2.0 # Apache-2.0 oslo.utils>=3.18.0 # Apache-2.0 pbr>=1.8 # Apache-2.0 keystoneauth1>=2.18.0 # Apache-2.0 -requests!=2.12.2,>=2.10.0 # Apache-2.0 +requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0 six>=1.9.0 # MIT stevedore>=1.17.1 # Apache-2.0 debtcollector>=1.2.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 43e9e72..bd42464 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,8 +9,8 @@ oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD requests-mock>=1.1 # Apache-2.0 -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +sphinx>=1.5.1 # BSD testrepository>=0.0.18 # Apache-2.0/BSD oslosphinx>=4.7.0 # Apache-2.0 reno>=1.8.0 # Apache-2.0 -tempest>=12.1.0 # Apache-2.0 +tempest>=14.0.0 # Apache-2.0 |