Sync with global requirements

emonty · emonty · commit 3a92ffa823c4 · 2013-08-03T14:58:43.000-04:00
Change-Id: I1969b4d74363a8d77cbb5dac661874f3bea2e96c
diff --git 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
diff --git a/setup.cfg b/setup.cfg
@@ -21,10 +21,6 @@ classifier =
 packages =
     openstackclient
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     openstack = openstackclient.shell:main
diff --git a/setup.py b/setup.py
@@ -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
@@ -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
