diff options
| author | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-07-15 01:37:08 +0000 |
|---|---|---|
| committer | OpenStack Proposal Bot <openstack-infra@lists.openstack.org> | 2015-07-15 01:37:08 +0000 |
| commit | 352d4cbdd0cf24b85d971d83c0ce8083dcb4eb76 (patch) | |
| tree | 5a3a1b63a106f316487a609c26806fe1dfc61f0c | |
| parent | 3209cd1ba6976e3757bc52963b5926614cf9ee2c (diff) | |
| download | python-designateclient-352d4cbdd0cf24b85d971d83c0ce8083dcb4eb76.tar.gz | |
Updated from global requirements
Change-Id: I994b85b635252905c72949b6870feadd97e7793e
| -rw-r--r-- | requirements.txt | 4 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/requirements.txt b/requirements.txt index 86466d6..21400ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ # process, which may cause wedges in the gate later. cliff>=1.13.0 # Apache-2.0 jsonschema!=2.5.0,<3.0.0,>=2.0.0 -oslo.utils>=1.6.0 # Apache-2.0 -pbr<2.0,>=0.11 +oslo.utils>=1.9.0 # Apache-2.0 +pbr<2.0,>=1.3 python-keystoneclient>=1.6.0 requests>=2.5.2 six>=1.9.0 @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 0a3b1c3..4d7517d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,9 +4,10 @@ # Hacking already pins down pep8, pyflakes and flake8 hacking<0.10,>=0.9.2 coverage>=3.6 -mock>=1.0 +mock>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' discover -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 python-subunit>=0.0.18 requests-mock>=0.6.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 |