Stop using the d2to1-based pbr

pbr updated itself to remove the d2to1 dependency. One of the main
reasons for this is a direct upstream dependency on distribute, which
causes the distribute/setuptools merge bug to get triggered, which
breaks people's system if they install with pip < 1.4.

Remove d2to1 references, and also bump the required version requested of
pbr to a version late enough to no longer depend on d2to1.

Remove the version specifier from setup.py, because setup_requires has
no way to trigger a version requirement upgrade. The flat version should
be sufficient for the setup.py interface in perpetuity.

Remove the setup-hook from setup.cfg, as it is no longer needed.

Change-Id: I40d3507c77802d13fd894aa16714b2ed6aa7d59f
This commit is contained in:
Monty Taylor 2013-09-30 10:31:52 -04:00
parent 5c646eb558
commit 2ac02e0ef5
3 changed files with 3 additions and 8 deletions

View File

@ -1,5 +1,4 @@
d2to1>=0.2.10,<0.3
pbr>=0.5,<0.6
pbr>=0.5.21,<1.0
SQLAlchemy >= 0.6
decorator

View File

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

View File

@ -17,5 +17,5 @@
import setuptools
setuptools.setup(
setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5.10,<0.6'],
d2to1=True)
setup_requires=['pbr'],
pbr=True)