Fixed PYTHONPATH for Sphinx docs generation.

Author: mboersma

.gitignore

@@ -53,6 +53,7 @@ venv/
 Vagrantfile.local
 *.swp
 .bundle
+/__init__.py
 
 # Chef setup
 .chef

docs/conf.py

@@ -17,8 +17,11 @@
 # 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.insert(0, os.path.abspath('.'))
-sys.path.insert(0, os.path.abspath('..'))
+
+# Some hackery here to get deis.py to be importable as client.deis
+open(os.path.join('..', '__init__.py'), 'a')
+sys.path.insert(0, os.path.abspath(os.path.join('..')))
+sys.path.insert(0, os.path.abspath(os.path.join('..', 'controller')))
 # create local_settings.py for SECRET_KEY if necessary
 local_settings_path = os.path.abspath(
     os.path.join('..', 'controller', 'deis', 'local_settings.py'))
@@ -137,7 +140,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['../web/static']
+html_static_path = ['../controller/web/static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

docs/index.rst

@@ -9,7 +9,7 @@ Deis is a Django/Celery API server, Python CLI and set of
 `Chef cookbooks`_ that combine to provide a Heroku-inspired application
 platform for public and private clouds. Your PaaS. Your Rules.
 
-.. image:: ../web/static/img/deis-graphic.png
+.. image:: ../controller/web/static/img/deis-graphic.png
     :alt: Deis cover logo
 
 If you are new to Deis, you should start with :ref:`Concepts`