summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-08-10 02:55:32 -0400
committerChris McDonough <chrism@plope.com>2013-08-10 02:55:32 -0400
commit881e8e2aa57ea2a77d91c3cd8401395f4a815eb1 (patch)
treec33943e321732e4bf629ee57ff65e515b24567ed /docs
parent0b02684691c5435b4abaa32f06e1837ca0d465e0 (diff)
parent4bf77f16764ab1db2e0a55acaea9f8a8053ad673 (diff)
downloadpyramid-881e8e2aa57ea2a77d91c3cd8401395f4a815eb1.tar.gz
pyramid-881e8e2aa57ea2a77d91c3cd8401395f4a815eb1.tar.bz2
pyramid-881e8e2aa57ea2a77d91c3cd8401395f4a815eb1.zip
Merge branch 'master' of github.com:Pylons/pyramid
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