diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-05 17:20:10 +0200 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-08-05 17:20:10 +0200 |
| commit | 3e53e141e0a0f03738b3943d0b0d77b1bf49883e (patch) | |
| tree | 15d68cff9d1cba84c6bedb9ab08246c2d37184d1 | |
| parent | 047f8663da4dfe9ef6c2aa4e804d1621fde4563f (diff) | |
| download | external_python_setuptools-3e53e141e0a0f03738b3943d0b0d77b1bf49883e.tar.gz external_python_setuptools-3e53e141e0a0f03738b3943d0b0d77b1bf49883e.tar.bz2 external_python_setuptools-3e53e141e0a0f03738b3943d0b0d77b1bf49883e.zip | |
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
| -rw-r--r-- | docs/conf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/conf.py b/docs/conf.py index 661ac486..9929aaf6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. |