From 10df11a1bb0b889ecded37a3f0ccdf6eac2184c0 Mon Sep 17 00:00:00 2001 From: Tim Van Steenburgh Date: Tue, 20 Dec 2016 12:33:18 -0500 Subject: [PATCH] Release prep --- Makefile | 5 ++++- VERSION | 1 + docs/conf.py | 13 +++++++++---- setup.py | 3 ++- 4 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 VERSION diff --git a/Makefile b/Makefile index 4a4ea32..07a459a 100644 --- a/Makefile +++ b/Makefile @@ -22,4 +22,7 @@ docs: .tox $(BIN)/sphinx-apidoc -o docs/api/ juju/ $(BIN)/sphinx-build -b html docs/ docs/_build/ -.PHONY: clean client test docs +upload: docs + $(PY) setup.py sdist upload upload_docs --upload-dir=docs/_build + +.PHONY: clean client test docs upload diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..8acdd82 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.1 diff --git a/docs/conf.py b/docs/conf.py index 2c55672..a856985 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -15,6 +15,11 @@ import sys import os +from pathlib import Path + +here = Path(__file__).absolute().parent +version = (here.parent / 'VERSION').read_text().strip() + # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. @@ -49,8 +54,8 @@ source_suffix = '.rst' master_doc = 'index' # General information about the project. -project = u'libjuju' -copyright = u'2016, Canonical' +project = u'juju' +copyright = u'2016, Canonical Ltd.' author = u'Canonical' # The version info for the project you're documenting, acts as replacement for @@ -58,9 +63,9 @@ author = u'Canonical' # built documents. # # The short X.Y version. -version = u'0.0.0' +version = version # The full version, including alpha/beta/rc tags. -release = u'0.0.0' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 64fadf7..47b9d0e 100644 --- a/setup.py +++ b/setup.py @@ -17,10 +17,11 @@ from setuptools import setup, find_packages here = Path(__file__).absolute().parent readme = here / 'docs' / 'readme.rst' +version = here / 'VERSION' setup( name='juju', - version="0.0.1", + version=version.read_text().strip(), packages=find_packages( exclude=["*.tests", "*.tests.*", "tests.*", "tests"]), install_requires=[ -- 2.17.1