diff options
| author | Craig Citro <craigcitro@gmail.com> | 2015-01-05 11:36:15 -0800 |
|---|---|---|
| committer | Craig Citro <craigcitro@gmail.com> | 2015-01-05 23:14:07 -0800 |
| commit | 962cf74715ccd4cc9448eff2276bf490519a85cf (patch) | |
| tree | c46ef65fb7a4fabe3351c7d83d75860d375d2f9c /docs/conf.py | |
| parent | 2cf1fa360de57330ee3052dab81777e5bc413270 (diff) | |
| download | oauth2client-962cf74715ccd4cc9448eff2276bf490519a85cf.tar.gz | |
Automate doc creation.
This adds several pieces for doc creation:
* a script to automate fetching the GAE SDK,
* updates `doc-build` to fetch the SDK and use sphinx,
* a dummy `django_settings` module where needed,
* a `tox` target to build, and
* use of `ghp-import` to push the changes into the gh-pages branch.
Diffstat (limited to 'docs/conf.py')
| -rw-r--r-- | docs/conf.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/conf.py b/docs/conf.py index 4776ed0..c7d8f73 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -31,8 +31,8 @@ import os extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.coverage', + 'sphinx.ext.napoleon', 'sphinx.ext.viewcode', - 'sphinxcontrib.napoleon', ] # Add any paths that contain templates here, relative to this directory. @@ -100,6 +100,11 @@ pygments_style = 'sphinx' # If true, keep warnings as "system message" paragraphs in the built documents. #keep_warnings = False +# In order to load django before 1.7, we need +import django +if django.VERSION[1] < 7: + sys.path.insert(0, '.') + os.environ['DJANGO_SETTINGS_MODULE'] = 'django_settings' # -- Options for HTML output ---------------------------------------------- |