summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
commit0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch)
tree6d9f12bc42fde9fea95d7754f2decff212acf6ee /docs/conf.py
parentd44d0e044555cd1287680fc8368632a64ebe979b (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/conf.py')
-rw-r--r--docs/conf.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py
index 84b01a791..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.4'
+version = pkg_resources.get_distribution('pyramid').version
# The full version, including alpha/beta/rc tags.
release = version