diff --git a/doc/source/conf.py b/doc/source/conf.py index 35f9bb6..7667ab9 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -57,10 +57,11 @@ copyright = u'2010, Willow Garage' # |version| and |release|, also used in various other places throughout the # built documents. # +# Version info +from jenkins.version import version_info as python_jenkins_version +release = python_jenkins_version.version_string_with_vcs() # The short X.Y version. -version = '0.2' -# The full version, including alpha/beta/rc tags. -release = '0.2' +version = python_jenkins_version.canonical_version_string() # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/jenkins/version.py b/jenkins/version.py new file mode 100644 index 0000000..8ce63bf --- /dev/null +++ b/jenkins/version.py @@ -0,0 +1,20 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 + +# Copyright 2011 OpenStack LLC +# Copyright 2012 Hewlett-Packard Development Company, L.P. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import pbr.version + +version_info = pbr.version.VersionInfo('jenkins') diff --git a/requirements.txt b/requirements.txt index ffe2fce..c756cfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ six +pbr>=0.8.2,<1.0