aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-07-13 20:48:26 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-07-13 20:48:26 -0400
commit5896424c4061b74ed9625077131df0f8e4cd2a10 (patch)
tree240799547b0b5324b2a4a4bfa5e4e2f3131c465b
parent0cb9cd7aaa256fc5e14900958250a8911afa08ba (diff)
downloadexternal_python_setuptools-5896424c4061b74ed9625077131df0f8e4cd2a10.tar.gz
external_python_setuptools-5896424c4061b74ed9625077131df0f8e4cd2a10.tar.bz2
external_python_setuptools-5896424c4061b74ed9625077131df0f8e4cd2a10.zip
Have the documentation also grab the version from setuptools/__init__.py
-rw-r--r--docs/conf.py5
-rw-r--r--release.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 3c71f326..fbdb8b51 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,6 +15,7 @@
# serve to show the default.
import sys, os
+import setuptools
# 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
@@ -48,9 +49,9 @@ copyright = '2009-2013, The fellowship of the packaging'
# built documents.
#
# The short X.Y version.
-version = '0.9.1'
+version = setuptools.__version__
# The full version, including alpha/beta/rc tags.
-release = '0.9.1'
+release = setuptools.__version__
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/release.py b/release.py
index 34b250b2..0e1a5397 100644
--- a/release.py
+++ b/release.py
@@ -16,7 +16,7 @@ def before_upload():
_linkify('CHANGES.txt', 'CHANGES (linked).txt')
files_with_versions = (
- 'docs/conf.py', 'ez_setup.py', 'setuptools/__init__.py',
+ 'ez_setup.py', 'setuptools/__init__.py',
)
test_info = "Travis-CI tests: http://travis-ci.org/#!/jaraco/setuptools"