docs bugfix

tethysplatform · Feb 12, 2016 · 739fb90 · 739fb90
1 parent 9d8b8e7
commit 739fb90
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -14,12 +14,19 @@
 
 import sys
 import os
+import re
 
 # Fixes django settings module problem
 sys.path.insert(0, os.path.abspath('..'))
 from django.conf import settings
-from ..tethys_apps.settings import INSTALLED_APPS
-settings.configure(INSTALLED_APPS = INSTALLED_APPS)
+
+# parse the installed apps list from the settings template
+with open('../tethys_apps/cli/gen_templates/settings', 'r') as settings_file:
+    settings_str = settings_file.read()
+    match = re.search('INSTALLED_APPS = \(\n(.*?)\)', settings_str, re.DOTALL)
+    installed_apps = [app.strip('\'|,') for app in match.group(1).split()]
+
+settings.configure(INSTALLED_APPS = installed_apps)
 import django
 django.setup()
 

diff --git a/docs/features.rst b/docs/features.rst
@@ -97,7 +97,7 @@ HTCondor provides a way to make use of the idle computing power that is already
 
 .. note::
 
-    To learn more, read the :doc:`./tethys_sdk/cloud_computing`.
+    To learn more, read the :doc:`./tethys_sdk/jobs` and the :doc:`./tethys_sdk/compute`.
 
 
 Acknowledgements

diff --git a/docs/installation/mac.rst b/docs/installation/mac.rst
@@ -219,7 +219,7 @@ c. Start the docker containers with the following command:
 4. Install HTCondor (Optional)
 ------------------------------
 
-HTCondor is a job scheduling and resource management system that is used by the Tethys Compute module. Distributed computing can be configured without installing HTCondor. For more information on how HTCondor is used for distributed computing in Tethys and the different configuration options see :doc:`../tethys_sdk/cloud_computing`.
+HTCondor is a job scheduling and resource management system that is used by the Tethys Compute module. Distributed computing can be configured without installing HTCondor. For more information on how HTCondor is used for distributed computing in Tethys and the different configuration options see :doc:`../tethys_sdk/compute`.
 
 a. Use a browser to download the HTCondor tarball from the `HTCondor downloads page. <http://research.cs.wisc.edu/htcondor/downloads/>`_ Click the link next to the version you wish to install. Select condor-X.X.X-x86_64_MacOSX-stripped.tar.gz, complete the rest of the form to submit your download request. This should redirect you to a page with a link to download the tarball.
 

diff --git a/docs/software_suite.rst b/docs/software_suite.rst
@@ -84,7 +84,7 @@ Distributed Computing
 
 To facilitate the large-scale computing that is often required by water resources applications, Tethys Software Suite leverages the computing management middleware `HTCondor <http://research.cs.wisc.edu/htcondor/>`_. HTCondor is both a resource management and a job scheduling software.
 
-To use the HTCondor and the computing capabilities in your app use the :doc:`./tethys_sdk/cloud_computing`.
+To use the HTCondor and the computing capabilities in your app use the :doc:`./tethys_sdk/jobs` and the :doc:`./tethys_sdk/compute`.
 
 
 File Dataset Storage

diff --git a/tethys_compute/job_manager.py b/tethys_compute/job_manager.py
@@ -187,7 +187,7 @@ def __init__(self, name, parameters=None):
 
 class CondorJobTemplate(JobTemplate):
     """
-    A subclass of the JobTemplate with the ``type argument set to CondorJob.
+    A subclass of the JobTemplate with the ``type`` argument set to CondorJob.
 
     Args:
         name (str): Name to refer to the template.