From 206650597bc9918691f5ed0ac63d8318db23d899 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 11 May 2013 13:49:12 -0400
Subject: [PATCH] Migrate to pbr.

Fixes bug 1179007

Change-Id: Iaa8a2722938d0b25df1041695f3c1c8dbf563b47
---
 CONTRIBUTING.rst | 17 +++++++++++++++
 MANIFEST.in      |  3 ++-
 requirements.txt |  5 ++++-
 setup.cfg        | 33 +++++++++++++++++++++++++++++
 setup.py         | 55 ++++++++++++------------------------------------
 tox.ini          |  6 +-----
 6 files changed, 70 insertions(+), 49 deletions(-)
 create mode 100644 CONTRIBUTING.rst
 create mode 100755 setup.cfg

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000..513270a
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,17 @@
+If you would like to contribute to the development of OpenStack,
+you must follow the steps in the "If you're a developer, start here"
+section of this page:
+
+   http://wiki.openstack.org/HowToContribute
+
+Once those steps have been completed, changes to OpenStack
+should be submitted for review via the Gerrit tool, following
+the workflow documented at:
+
+   http://wiki.openstack.org/GerritWorkflow
+
+Pull requests submitted through GitHub will be ignored.
+
+Bugs should be filed on Launchpad, not GitHub:
+
+   https://bugs.launchpad.net/heat
diff --git a/MANIFEST.in b/MANIFEST.in
index 89b89a8..cc06ffa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
+include CONTRIBUTING.rst
 include LICENSE
 include README.rst
 include MANIFEST.in
 graft doc
-graft tools
\ No newline at end of file
+graft tools
diff --git a/requirements.txt b/requirements.txt
index 52f376c..d0b3081 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,5 @@
+d2to1>=0.2.10,<0.3
+pbr>=0.5.10,<0.6
+
 boto==2.5.2
-psutil
\ No newline at end of file
+psutil<1.0
diff --git a/setup.cfg b/setup.cfg
new file mode 100755
index 0000000..f0088ef
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,33 @@
+[metadata]
+name = heat-cfntools
+summary = Tools required to be installed on Heat provisioned cloud instances
+description-file =
+    README.rst
+author = OpenStack
+author-email = openstack-dev@lists.openstack.org
+home-page = http://www.openstack.org/
+classifier =
+    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
+
+[files]
+packages =
+    heat_cfntools
+scripts =
+    bin/cfn-create-aws-symlinks
+    bin/cfn-get-metadata
+    bin/cfn-hup
+    bin/cfn-init
+    bin/cfn-push-stats
+    bin/cfn-signal
+
+[global]
+setup-hooks =
+    pbr.hooks.setup_hook
diff --git a/setup.py b/setup.py
index 8809657..b3e85a7 100755
--- a/setup.py
+++ b/setup.py
@@ -1,50 +1,21 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-# Copyright (c) 2013 Red Hat, Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-import os
 import setuptools
 
-
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
-
 setuptools.setup(
-    name='heat-cfntools',
-    version='1.2.3',
-    description='Tools required to be installed on Heat '
-    'provisioned cloud instances',
-    long_description=read('README.rst'),
-    license='Apache License (2.0)',
-    author='Heat API Developers',
-    author_email='discuss@heat-api.org',
-    url='http://heat-api.org.org/',
-    packages=setuptools.find_packages(exclude=['bin']),
-    include_package_data=True,
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2.6',
-        'Environment :: No Input/Output (Daemon)',
-    ],
-    scripts=[
-        'bin/cfn-get-metadata',
-        'bin/cfn-hup',
-        'bin/cfn-init',
-        'bin/cfn-push-stats',
-        'bin/cfn-signal',
-        'bin/cfn-create-aws-symlinks'],
-    py_modules=[])
+    setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
+    d2to1=True)
diff --git a/tox.ini b/tox.ini
index 7ae1ea3..3616e8d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,6 @@ deps = -r{toxinidir}/requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [tox:jenkins]
-sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
@@ -24,11 +23,8 @@ deps = -r{toxinidir}/requirements.txt
 commands = bash tools/lintstack.sh
 
 [testenv:cover]
-# Also do not run test_coverage_ext tests while gathering coverage as those
-# tests conflict with coverage.
 commands =
-  python setup.py testr --coverage \
-    --testr-args='^(?!.*test.*coverage).*$'
+  python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:venv]
 commands = {posargs}