Commit 3e53e141 authored by Jason R. Coombs's avatar Jason R. Coombs

Sphinx allows a callable named 'setup' to be provided in the config. If...

Sphinx allows a callable named 'setup' to be provided in the config. If present, it attempts to call it. Therefore, use another name when importing the setup module. The docs may now be built using 'setup.py build_sphinx'.

--HG--
extra : rebase_source : a5f5e0d9d624f976b7a12e44adf3cc94d4f6ac44
parent 047f8663
......@@ -14,7 +14,7 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
import setup
import setup as setup_script
# 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 +48,9 @@ copyright = '2009-2013, The fellowship of the packaging'
# built documents.
#
# The short X.Y version.
version = setup.setup_params['version']
version = setup_script.setup_params['version']
# The full version, including alpha/beta/rc tags.
release = setup.setup_params['version']
release = setup_script.setup_params['version']
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment