From ad55705a80104a5880c46e4355c47e9daeec0cec Mon Sep 17 00:00:00 2001 From: Eric Fried Date: Wed, 25 May 2016 17:09:54 -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: Iff8d31526ce485277530da9ab90bd6fbe2d31ecf Closes-Bug: 1585027 --- nova_powervm/version.py | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova_powervm/version.py b/nova_powervm/version.py index a4216270..0701a7c0 100644 --- a/nova_powervm/version.py +++ b/nova_powervm/version.py @@ -14,4 +14,4 @@ import pbr.version -version_info = pbr.version.VersionInfo('__package__') +version_info = pbr.version.VersionInfo(__package__) diff --git a/requirements.txt b/requirements.txt index 606dad11..5b1990cf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,4 +7,4 @@ oslo.log>=1.14.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.5.0 # Apache-2.0 taskflow>=1.26.0 # Apache-2.0 -setuptools<20.2 +setuptools>=16.0