diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-29 21:14:51 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-29 21:14:51 -0400 |
commit | 626fa69fb0470710e870628afd0cb7ec0ba96ddf (patch) | |
tree | befcacc09c560133266eb5a1757a45ea43d93453 /docs/conf.py | |
parent | 96aed21b42121acde68dd6b3732c3fbae0903569 (diff) | |
parent | 9e7f35fec4178dea678693cb768b6076d45e7ddd (diff) | |
download | external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.tar.gz external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.tar.bz2 external_python_setuptools-626fa69fb0470710e870628afd0cb7ec0ba96ddf.zip |
Merge with 6.0.2
--HG--
branch : feature/issue-229
Diffstat (limited to 'docs/conf.py')
-rw-r--r-- | docs/conf.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py index 9929aaf6..8be5c3dd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,14 +12,17 @@ # autogenerated file. # # All configuration values have a default; values that are commented out -# serve to show the default. - -import setup as setup_script +# serve to show the default # 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 # documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.append(os.path.abspath('.')) + +# Allow Sphinx to find the setup command that is imported below, as referenced above. +import sys, os +sys.path.append(os.path.abspath('..')) + +import setup as setup_script # -- General configuration ----------------------------------------------------- |