Fix package reference in version code

The package version file erroneously contained quotes here:

version_info = pbr.version.VersionInfo('__package__')

This caused docs builds using setuptools at or beyond 20.2 to fail with:

pkg_resources.RequirementParseError: Invalid requirement, parse error at
"'__packag'"

This change set remedies the line to refer to __package__ (a builtin
variable which resolves to the package name) rather than the literal
string '__package__':

version_info = pbr.version.VersionInfo(__package__)

...and updates the requirements file to use a setuptools version at or
beyond 16.0 to align with openstack's global requirements.

Change-Id: I9ba12bb256c5d3213eb07ddf13351178bf06114b
Closes-Bug: 1585027
This commit is contained in:
Eric Fried 2016-05-26 08:45:53 -05:00
parent e904cd0e50
commit 411bbb50b1
2 changed files with 2 additions and 2 deletions

View File

@ -14,4 +14,4 @@
import pbr.version
version_info = pbr.version.VersionInfo('__project__')
version_info = pbr.version.VersionInfo(__package__)

View File

@ -1,3 +1,3 @@
oslo.log>=1.14.0 # Apache-2.0
pbr>=1.6 # Apache-2.0
setuptools<20.2
setuptools>=16.0