From 371fd80a7a2d810586157860e3b53472c4d3bf6a Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 1 Jan 2014 17:33:55 +0100 Subject: [PATCH] Version handling Add new parameter --version pbr uses version number from git (via tags), so remove our own version number. Once we tag a version "0.1", this will be the version number. Change-Id: Idcf9e4ddeebf637eb36797afd2855d1c657e52ea --- autogenerate-config-docs/__init__.py | 18 ++++++++++++++++++ os_doc_tools/__init__.py | 18 ++++++++++++++++++ os_doc_tools/doctest.py | 5 +++++ setup.cfg | 1 - 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/autogenerate-config-docs/__init__.py b/autogenerate-config-docs/__init__.py index e69de29b..52601d6a 100644 --- a/autogenerate-config-docs/__init__.py +++ b/autogenerate-config-docs/__init__.py @@ -0,0 +1,18 @@ +# Copyright 2012 OpenStack Foundation +# +# 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__ = pbr.version.VersionInfo('openstack-doc-tools').version_string() diff --git a/os_doc_tools/__init__.py b/os_doc_tools/__init__.py index e69de29b..52601d6a 100644 --- a/os_doc_tools/__init__.py +++ b/os_doc_tools/__init__.py @@ -0,0 +1,18 @@ +# Copyright 2012 OpenStack Foundation +# +# 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__ = pbr.version.VersionInfo('openstack-doc-tools').version_string() diff --git a/os_doc_tools/doctest.py b/os_doc_tools/doctest.py index 1ed2e53a..31ebbe1a 100755 --- a/os_doc_tools/doctest.py +++ b/os_doc_tools/doctest.py @@ -31,6 +31,8 @@ Requires: - Maven ''' +import os_doc_tools + from lxml import etree import argparse @@ -842,6 +844,9 @@ def main(): parser.add_argument("--api-site", help="Special handling for " "api-site repository", action="store_true") + parser.add_argument('--version', + action='version', + version=os_doc_tools.__version__) prog_args = parser.parse_args() if not prog_args.api_site: diff --git a/setup.cfg b/setup.cfg index 9e2c1f89..f0c6be93 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,5 @@ [metadata] name = openstack-doc-tools -version = 0.1 summary = Tools for OpenStack Documentation description-file = README.rst