summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2012-08-03 15:45:36 -0500
committerMonty Taylor <mordred@inaugust.com>2012-08-03 15:52:55 -0500
commit40b11533734c4e54d48e3724167ecf4d9d829292 (patch)
tree231ddaf858b9708b5fdabb5c126613966d9d097a
parenta9732cf178de7d83229fd85d57c163fb6e8770f9 (diff)
downloadpbr-40b11533734c4e54d48e3724167ecf4d9d829292.tar.gz
Fix recursion.0.4.4
Change-Id: Idb705df8eb389f83161c02c2d64482f36fc61a36
-rw-r--r--pbr/version.py6
-rw-r--r--setup.py1
2 files changed, 6 insertions, 1 deletions
diff --git a/pbr/version.py b/pbr/version.py
index f9b092e..bf5dd63 100644
--- a/pbr/version.py
+++ b/pbr/version.py
@@ -171,6 +171,12 @@ class VersionInfo(object):
"python-glanceclient"
:param pre_version: optional version that the project is working to
"""
+ # We have to kill a recursion bug in pkg_resources here
+ from pkg_resources import EntryPoint
+ def bogus_require(self, *args, **kwargs):
+ pass
+ EntryPoint.require = bogus_require
+
self.package = package
if python_package is None:
self.python_package = package
diff --git a/setup.py b/setup.py
index c64f055..f4667ed 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,6 @@ setuptools.setup(
url="https://github.com/openstack-dev/pbr",
packages=setuptools.find_packages(),
include_package_data=True,
- install_requires=pbr.requires.parse_requirements('tools/pip-requires'),
cmdclass=pbr.cmdclass.get_cmdclass('pbr/versioninfo'),
classifiers=[
"Environment :: Console",