summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorSamuel Merritt <sam@swiftstack.com>2013-10-08 14:16:32 -0700
committerSamuel Merritt <sam@swiftstack.com>2013-10-10 11:57:47 -0700
commit7d61c543993638caf5dbe176ed6c077ee506d87e (patch)
tree6f48538322cf42634e060c07b252480d3647e6d2 /doc/source
parent68dde8dd514e4eef89aafa6c1c93e065045c3cbd (diff)
downloadpython-swiftclient-7d61c543993638caf5dbe176ed6c077ee506d87e.tar.gz
Make pbr only a build-time dependency.
This lets you build python-swiftclient packages that don't require pbr to be installed at all. You would need pbr on the machine running rpmbuild / debuild, but not on the machines that install the packages. Unfortunately, this does not make python-swiftclient able to be installed via pip 0.3.1 on Lucid; you'll need to uninstall the system python-pip package and install a new pip some other way. Given that pip < 1.3 doesn't perform SSL certificate validation for pypi (trivial MITM attack, anyone?), you'd probably want to get a new pip anyway. Change-Id: I85d4d77aacf094e48d39e48e750594b95dbc7af0
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/conf.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 356b89e..19bc85c 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -57,9 +57,9 @@ copyright = u'2013 OpenStack, LLC.'
# |version| and |release|, also used in various other places throughout the
# built documents.
#
-from swiftclient.version import version_info as swiftclient_version
-release = swiftclient_version.version_string()
-version = swiftclient_version.version_string()
+import swiftclient.version
+release = swiftclient.version.version_string
+version = swiftclient.version.version_string
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.