Changeset 5bf0331 in sasview for docs/sphinx-docs/source/conf.py

Timestamp:

May 5, 2014 9:21:47 AM (11 years ago)

Author:

pkienzle

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

644ca73

Parents:

6f87cc1 (diff), 0089be3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from trunk

File:

• docs/sphinx-docs/source/conf.py (modified) (4 diffs)

docs/sphinx-docs/source/conf.py

@@ -12 +12 @@
 # serve to show the default.
 
-import sys, os, collections
+import sys, os
 
 # 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.
-from distutils.util import get_platform
-platform = '.%s-%s'%(get_platform(),sys.version[:3])
-build_lib = os.path.abspath('../../../build/lib'+platform)
-sys.path.insert(0, build_lib)
-print "-- path --"
-print "\n".join(sys.path)
-import sans.sansview
-from sans.sansview import __version__ as sasview_version
-print "version:",sasview_version
+sys.path.insert(0, os.path.abspath('../../src'))
 
 # -- General configuration -----------------------------------------------------
@@ -34 +26 @@
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc',
-              'sphinx.ext.todo',
-              'sphinx.ext.coverage',
-              'sphinx.ext.mathjax',
-              'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.mathjax', 'sphinx.ext.viewcode']
 
 # Add any paths that contain templates here, relative to this directory.
@@ -77 +65 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-#
-# PGP 2014/04/03: We have some code which doesn't get carried over to
-# the build directory.  Exclude the appropriate *.rst files here so
-# that we don't get various "ImportError: No module named ___" when
-# running Sphinx.
-exclude_patterns = ["*sans.perspectives.simulation.rst",
-                    "*sans.pr.c_extensions.rst",
-                    "*sans.realspace.rst",
-                    "*sans.simulation.rst",]
+exclude_patterns = []
 
 # The reST default role (used for this markup: `text`) to use for all documents.
@@ -189 +169 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'SasViewdoc'
-
-# Turn off permalinks, which are a nice feature for the docs when viewed in a
-# browser, but which look weird (and cannot be "right-click->copy url") in
-# the SasView help.
-html_add_permalinks = ""