summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile4
-rw-r--r--doc/source/conf.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 82dcc741c..24959750a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -132,6 +132,10 @@ htmlhelp-build: htmlhelp build/htmlhelp/numpy.chm
%.chm: %.hhp
-hhc.exe $^
+qthelp: generate
+ mkdir -p build/qthelp build/doctrees
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp
+
latex: generate
mkdir -p build/latex build/doctrees
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1fbd0c60e..b610470de 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -45,6 +45,7 @@ copyright = '2008-2009, The Scipy community'
import numpy
# The short X.Y version (including .devXXXX, rcX, b1 suffixes if present)
version = re.sub(r'(\d+\.\d+)\.\d+(.*)', r'\1\2', numpy.__version__)
+version = re.sub(r'(\.dev\d+).*?$', r'\1', version)
# The full version, including alpha/beta/rc tags.
release = numpy.__version__
print version, release