From 0878f09e5fd4ee8aeb4a6fd7fc0a4964ab8f4d4a Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 13 Sep 2018 11:23:40 -0400 Subject: [PATCH] Pull version strings from PBR We've been using PBR for awhile but never updated the docs config to get it's versioning info from it. Change-Id: I0884ab9835c0cb763395fc877d04fb0f8ad488b9 Signed-off-by: Thanh Ha --- docs/conf.py | 7 ++++--- docs_conf/__init__.py | 1 - setup.py | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 369cfc2..0607d9e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,8 +15,9 @@ import sys # Sys.path for RTD to resolve docs_conf package sys.path.insert(0, os.path.abspath('..')) -from docs_conf import __version__ +from pbr.version import VersionInfo + from docs_conf.conf import * -version=__version__ -release=__version__ +version=str(VersionInfo('lfdocs-conf')) +release=str(VersionInfo('lfdocs-conf')) diff --git a/docs_conf/__init__.py b/docs_conf/__init__.py index 776c9f4..211e5ed 100644 --- a/docs_conf/__init__.py +++ b/docs_conf/__init__.py @@ -15,4 +15,3 @@ Configure sphinx-doc through an YAML file. """ __author__ = 'Linux Foundation Releng' __summary__ = 'Linux Foundation DocsConf' -__version__ = '0.2.5' diff --git a/setup.py b/setup.py index 27a940e..3c9c941 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,6 @@ Setup for Docs Configuration """ from setuptools import setup, find_packages -from docs_conf import __author__ -from docs_conf import __version__ - with open('requirements.txt') as f: install_reqs = f.read().splitlines() -- 2.16.6