From 411bbb50b15f9bc1b83480a114be699aa8b3610c Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Thu, 26 May 2016 08:45:53 -0500 Subject: [PATCH] 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 --- ceilometer_powervm/version.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ceilometer_powervm/version.py b/ceilometer_powervm/version.py index d80fa63..0701a7c 100644 --- a/ceilometer_powervm/version.py +++ b/ceilometer_powervm/version.py @@ -14,4 +14,4 @@ import pbr.version -version_info = pbr.version.VersionInfo('__project__') +version_info = pbr.version.VersionInfo(__package__) diff --git a/requirements.txt b/requirements.txt index d0f1492..f84948e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ oslo.log>=1.14.0 # Apache-2.0 pbr>=1.6 # Apache-2.0 -setuptools<20.2 +setuptools>=16.0