Update from global requirements

Also, more importantly, get rid of d2to1 references.

Change-Id: I3c51eaf807b8642d9326d110813f62a9b4898d5b

ironic/tests/conductor/test_manager.py

@@ -253,6 +253,9 @@ class ManagerTestCase(base.DbTestCase):
         """Test if an exception is thrown when the set_power call is
         failed.
         """
+        class TestException(Exception):
+            pass
+
         ndict = utils.get_test_node(driver='fake',
                                     power_state=states.POWER_OFF)
         node = self.dbapi.create_node(ndict)
@@ -263,10 +266,10 @@ class ManagerTestCase(base.DbTestCase):
             AndReturn(states.POWER_OFF)
         self.driver.power.set_power_state(mox.IgnoreArg(), node,
                                           states.POWER_ON).\
-                AndRaise(Exception('error returned from the power driver.'))
+                AndRaise(TestException())
         self.mox.ReplayAll()
 
-        self.assertRaises(Exception,
+        self.assertRaises(TestException,
                           self.service.start_power_state_change,
                           self.context,
                           node,

requirements.txt

@@ -1,27 +1,26 @@
-d2to1>=0.2.10,<0.3
+pbr>=0.5.21,<1.0
-pbr>=0.5.16,<0.6
+SQLAlchemy>=0.7.8,<=0.7.99
-SQLAlchemy>=0.7,<=0.7.99
 amqplib>=0.6.1
 anyjson>=0.3.3
 argparse
-eventlet>=0.12.0
+eventlet>=0.13.0
 kombu>=2.4.8
 lxml>=2.3
 WebOb>=1.2.3,<1.3
 greenlet>=0.3.2
-sqlalchemy-migrate>=0.7
+sqlalchemy-migrate>=0.7.2
 netaddr
 paramiko>=1.8.0
 iso8601>=0.1.4
-python-neutronclient>=2.2.3,<3
+python-neutronclient>=2.3.0,<3
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.3.0
+python-keystoneclient>=0.3.2
 stevedore>=0.10
 websockify>=0.5.1,<0.6
-oslo.config>=1.1.0
+oslo.config>=1.2.0
 pecan>=0.2.0
-six<1.4.0
+six
 jsonpatch>=1.1
-WSME>=0.5b2
 Cheetah>=2.4.4
+WSME>=0.5b5
 pyghmi

setup.cfg

@@ -18,10 +18,6 @@ classifier =
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 2.6
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [files]
 packages =
     ironic

setup.py

@@ -14,28 +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
 
-from ironic.openstack.common import setup as common_setup
-
-project = 'ironic'
-
 setuptools.setup(
-    name=project,
+    setup_requires=['pbr'],
-    version=common_setup.get_version(project, '2013.1'),
+    pbr=True)
-    description='Bare Metal controller',
-    classifiers=[
-        'Environment :: OpenStack',
-        'Intended Audience :: Information Technology',
-        'Intended Audience :: System Administrators',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 2.6',
-    ],
-    include_package_data=True,
-    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
-    d2to1=True,
-)

test-requirements.txt

@@ -1,8 +1,8 @@
-hacking>=0.5.6,<0.7
+hacking>=0.5.6,<0.8
 coverage>=3.6
 discover
-fixtures>=0.3.12
+fixtures>=0.3.14
-mock>=0.8.0
+mock>=1.0
 mox>=0.5.3
 Babel>=0.9.6
 MySQL-python