Update pbr and requirements to be current

The usage of pbr and the rest of the requirements need to be update to
be up to date with modern usage.

Change-Id: I7dd4c6d6f6721205a293d427851733a0391ea72e

requirements.txt

@@ -1,19 +1,18 @@
-d2to1>=0.2.10,<0.3
+pbr>=0.5.21,<1.0
-pbr>=0.5.16,<0.6
 
-babel
+Babel>=0.9.6
 netaddr
-falcon>=0.1.6,<0.1.8
+falcon>=0.1.6,<0.1.7
 iso8601>=0.1.4
 msgpack-python
-pymongo
+pymongo>=2.4
-python-keystoneclient
+python-keystoneclient>=0.3.2
 python-memcached
 redis
-simplejson
+simplejson>=2.0.9
-WebOb
+WebOb>=1.2.3,<1.3
-stevedore>=0.9
+stevedore>=0.10
-six>=1.4.1  # NOTE(cpp-cabrera): needed for add_metaclass
+six
 
 -f http://tarballs.openstack.org/oslo.config/oslo.config-1.2.0a4.tar.gz#egg=oslo.config-1.2.0a4
-oslo.config>=1.2.0a4
+oslo.config>=1.1.0

setup.cfg

@@ -1,5 +1,6 @@
 [metadata]
 name = marconi
+version = 2013.2
 summary = OpenStack Queuing and Notification Service
 description-file =
     README.rst
@@ -21,10 +22,6 @@ classifier =
 packages =
     marconi
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     marconi-gc = marconi.cmd.gc:run

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2013 Red Hat, Inc.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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>=0.2.10,<0.3', 'pbr>=0.5.16,<0.6'],
+    setup_requires=['pbr'],
-    d2to1=True)
+    pbr=True)

test-requirements.txt

@@ -1,22 +1,21 @@
+# Metrics and style
+hacking>=0.5.6,<0.8
+
 # Packaging
-mock
+mock>=1.0
-distribute>=0.6.24
 
 # Unit testing
-ddt
+ddt>=0.4.0
 discover
-fixtures
+fixtures>=0.3.14
 python-subunit
-testrepository
+testrepository>=0.0.17
-testtools
+testtools>=0.9.32
 
 # Functional Tests
-requests
+requests>=1.1
 
 # Test runner
 nose
 nose-exclude
-openstack.nose_plugin
+openstack.nose_plugin>=0.7
-
-# Metrics and style
-hacking

tox.ini

@@ -19,7 +19,6 @@ deps = -r{toxinidir}/requirements.txt
 commands = nosetests {posargs}
 
 [tox:jenkins]
-sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]