Migrate to pbr

Change-Id: Ib0a19dee8c138d91fda61635cd4f53cf25c965d3
Fixes: bug #1179007.

setup.cfg

@@ -1,3 +1,34 @@
+[metadata]
+name = python-marconiclient
+version = 0.1
+summary = Client Library for OpenStack Marconi Queueing API
+description-file =
+    README.rst
+author = OpenStack Foundation
+author-email = openstack-admins@lists.openstack.org
+home-page = http://www.openstack.org/
+classifier =
+    Development Status :: 2 - Pre-Alpha
+    Environment :: Console
+    Environment :: OpenStack
+    Intended Audience :: Information Technology
+    Intended Audience :: Developers
+    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.6
+    Programming Language :: Python :: 2.7
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
+
+[files]
+packages =
+    marconiclient
+
 [build_sphinx]
 source-dir = doc/source
 build-dir = doc/build

setup.py

@@ -15,34 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import setuptools
 
-name = 'python-marconiclient'
-
-
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 setuptools.setup(
-    name=name,
-    version="0.1",
-    description='Client Library for OpenStack Marconi Queueing API',
-    long_description=read('README.rst'),
-    url='https://launchpad.net/python-marconiclient',
-    license='Apache License (2.0)',
-    author='OpenStack, LLC.',
-    author_email='openstack-admins@lists.launchpad.net',
-    packages=setuptools.find_packages(exclude=['tests', 'tests.*']),
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Console',
-        'Environment :: OpenStack',
-        'Intended Audience :: Developers',
-        'Intended Audience :: Information Technology',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.7',
-        'Environment :: No Input/Output (Daemon)',
-    ],
-)
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
+    d2to1=True)

tools/pip-requires

@@ -0,0 +1,2 @@
+d2to1>=0.2.10,<0.3
+pbr>=0.5.16,<0.6

tools/test-requires

@@ -1,20 +1,18 @@
-# Packaging
-distribute>=0.6.24
-
 # Unit testing
 discover
-fixtures
-mox
+fixtures>=0.3.12
+mock>=0.8.0
+mox>=0.5.3
 python-subunit
-testrepository
-testtools
-
+testrepository>=0.0.13
+testtools>=0.9.32
 # Test runner
 nose
 nose-exclude
-openstack.nose_plugin
-
+openstack.nose_plugin>=0.7
 # Metrics and style
-coverage
-flake8
-hacking
+coverage>=3.6
+flake8==2.0
+hacking>=0.5.6,<0.6
+pep8==1.4.5
+pyflakes==0.7.2

tox.ini

@@ -28,4 +28,4 @@ commands = {posargs}
 
 [flake8]
 builtins = _
-exclude = .venv,.git,.tox,dist,doc,*openstack/common*
+exclude = .venv,.git,.tox,dist,doc,*.egg,*openstack/common*