summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-09 23:44:27 -0700
committerChris McDonough <chrism@plope.com>2013-08-09 23:44:27 -0700
commit4bf77f16764ab1db2e0a55acaea9f8a8053ad673 (patch)
tree80eeb4388429915439f8ca8ebabb52a8e17a7d13 /docs
parenta5907c66a748ee60ff6918cea39395c6a2134d83 (diff)
parent95d5b72927484fa3882c5c47bf79d591a5af50a5 (diff)
downloadpyramid-4bf77f16764ab1db2e0a55acaea9f8a8053ad673.tar.gz
pyramid-4bf77f16764ab1db2e0a55acaea9f8a8053ad673.tar.bz2
pyramid-4bf77f16764ab1db2e0a55acaea9f8a8053ad673.zip
Merge pull request #1070 from Pylons/feature/sphinx-autoversion
update sphinx conf.py to use the pyramid version from pkg_resources instead of needing to change it manually
Diffstat (limited to 'docs')
-rw-r--r--docs/conf.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index ff5f325d8..e50c0c60a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,6 +19,8 @@ import warnings
warnings.simplefilter('ignore', DeprecationWarning)
+import pkg_resources
+
# skip raw nodes
from sphinx.writers.text import TextTranslator
from sphinx.writers.latex import LaTeXTranslator
@@ -93,7 +95,7 @@ copyright = '2008-%s, Agendaless Consulting' % thisyear
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.5dev'
+version = pkg_resources.get_distribution('pyramid').version
# The full version, including alpha/beta/rc tags.
release = version