diff options
| author | Monty Taylor <mordred@inaugust.com> | 2013-08-03 14:58:43 -0400 |
|---|---|---|
| committer | Monty Taylor <mordred@inaugust.com> | 2013-08-03 14:58:43 -0400 |
| commit | 3a92ffa823c42daa0d285b01aeefe3543bd420cc (patch) | |
| tree | 2fbbd6333a3487caec5217d8ab4e119a8dafb6b4 | |
| parent | af874890221b145a8cb423d3c1fc5dc133dbef13 (diff) | |
| download | python-openstackclient-3a92ffa823c42daa0d285b01aeefe3543bd420cc.tar.gz | |
Sync with global requirements
Change-Id: I1969b4d74363a8d77cbb5dac661874f3bea2e96c
| -rw-r--r-- | requirements.txt | 15 | ||||
| -rw-r--r-- | setup.cfg | 4 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | test-requirements.txt | 11 |
4 files changed, 15 insertions, 20 deletions
diff --git a/requirements.txt b/requirements.txt index fe30e2dd..e2b99ff2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,8 @@ -d2to1>=0.2.10,<0.3 -pbr>=0.5,<0.6 -cliff +pbr>=0.5.16,<0.6 +cliff>=1.4 keyring -pycrypto -python-glanceclient>=0.9.0,<2 -python-keystoneclient>=0.2,<1.0 -python-novaclient>=2 -python-cinderclient>=1 +pycrypto>=2.6 +python-glanceclient>=0.9.0 +python-keystoneclient>=0.3.0 +python-novaclient>=2.12.0 +python-cinderclient>=1.0.4 @@ -21,10 +21,6 @@ classifier = packages = openstackclient -[global] -setup-hooks = - pbr.hooks.setup_hook - [entry_points] console_scripts = openstack = openstackclient.shell:main @@ -14,8 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools setuptools.setup( - setup_requires=['d2to1', 'pbr>=0.5,<0.6'], - d2to1=True) + setup_requires=['pbr>=0.5.20'], + pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 392348e2..692e71a9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,13 +2,12 @@ pep8==1.4.5 pyflakes==0.7.2 flake8==2.0 -hacking>=0.5.3,<0.6 +hacking>=0.5.6,<0.7 -coverage +coverage>=3.6 discover fixtures>=0.3.12 -mock -openstack.nose_plugin +mock>=0.8.0 sphinx>=1.1.2 -testrepository>=0.0.13 -testtools>=0.9.26 +testrepository>=0.0.17 +testtools>=0.9.32 |