summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorPhilip Thiem <ptthiem@gmail.com>2013-07-20 18:10:50 -0500
committerPhilip Thiem <ptthiem@gmail.com>2013-07-20 18:10:50 -0500
commita6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2 (patch)
tree8f73e0285965d86cbb6b8d8bc599789fd4a924ef /docs/conf.py
parent37c48a4da11b40a5a8a3c801525b637bb2934df1 (diff)
parent70067439d3b2b53cf2112ed0faf52c30b30ef3cd (diff)
downloadpython-setuptools-git-a6e7ef0ae1e0ea1f147a2196efe7f2b82c301fe2.tar.gz
Merge with default
--HG-- extra : rebase_source : 15517dca4272e2b088930cb5599f5822cef13bae
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 3fccd87f..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.8'
+version = setuptools.__version__
# The full version, including alpha/beta/rc tags.
-release = '0.8'
+release = setuptools.__version__
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.