diff options
| author | Philip Thiem <ptthiem@gmail.com> | 2013-09-28 12:33:19 -0500 |
|---|---|---|
| committer | Philip Thiem <ptthiem@gmail.com> | 2013-09-28 12:33:19 -0500 |
| commit | 78f01306a08285e9f2abe6ad749f6ce884e12555 (patch) | |
| tree | c4769869539d5ae9101a7e8e76a46e9e292b9b97 /docs/conf.py | |
| parent | 30bb58f069cf1624f35cfbdb725e8e443ff64330 (diff) | |
| parent | 49ce80613b7fcffd1882f7fb082e5bcc30e976f0 (diff) | |
| download | python-setuptools-git-78f01306a08285e9f2abe6ad749f6ce884e12555.tar.gz | |
Merge with default
--HG--
extra : rebase_source : d9c70d5bebd4290f568c828c5bc3a9b93a817ff2
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index fbdb8b51..9929aaf6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,8 +14,7 @@ # All configuration values have a default; values that are commented out # serve to show the default. -import sys, os -import setuptools +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 @@ -49,9 +48,9 @@ copyright = '2009-2013, The fellowship of the packaging' # built documents. # # The short X.Y version. -version = setuptools.__version__ +version = setup_script.setup_params['version'] # The full version, including alpha/beta/rc tags. -release = setuptools.__version__ +release = setup_script.setup_params['version'] # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |