Changeset 115eb7e in sasview

Timestamp:

Apr 10, 2017 9:49:59 AM (8 years ago)

Author:

ajj

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6c7e4cc1

Parents:

d26f025

Message:

Added warnings to build_sphix about missing directories.

Initial work to run sasmodels build from sasview setup.py

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (6 diffs)
• setup.py (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -206 +206 @@
                     tohere=os.path.join(SASMODELS_DEST_PROLOG,files)
                     shutil.copy(fromhere,tohere)
+    else: print "no source directory",SASMODELS_SOURCE_PROLOG, "was found"
 
     if os.path.exists(SASMODELS_SOURCE_GPU):
@@ -217 +218 @@
                     tohere=os.path.join(SPHINX_SOURCE_USER,files)
                     shutil.copy(fromhere,tohere)
+    else: print "no source directory",SASMODELS_SOURCE_GPU," was found"
 
     if os.path.exists(SASMODELS_SOURCE_SESANS):
@@ -228 +230 @@
                     tohere=os.path.join(SPHINX_SOURCE_USER,files)
                     shutil.copy(fromhere,tohere)
+    else: print "no source directory",SASMODELS_SOURCE_SESANS," was found"
 
     if os.path.exists(SASMODELS_SOURCE_MAGNETISM):
@@ -239 +242 @@
                     tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files)
                     shutil.copy(fromhere,tohere)
+    else: print "no source directory",SASMODELS_SOURCE_MAGNETISM," was found"
 
     if os.path.exists(SASMODELS_SOURCE_MAGIMG):
@@ -276 +280 @@
                     tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files)
                     shutil.copy(fromhere,tohere)
-    # But need to change the path to the model docs in the tocs
-    for files in os.listdir(SASMODELS_DEST_REF_MODELS):
-#        print files
-        if files.startswith("shape"):
-            print "Changing toc paths in", files
-            inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
-        if files.startswith("sphere"):
-            print "Changing toc paths in", files
-            inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
-        if files.startswith("custom"):
-            print "Changing toc paths in", files
-            inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
-        if files.startswith("structure"):
-            print "Changing toc paths in", files
-            inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
+            # But need to change the path to the model docs in the tocs
+            for files in os.listdir(SASMODELS_DEST_REF_MODELS):
+        #        print files
+                if files.startswith("shape"):
+                    print "Changing toc paths in", files
+                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
+                if files.startswith("sphere"):
+                    print "Changing toc paths in", files
+                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
+                if files.startswith("custom"):
+                    print "Changing toc paths in", files
+                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
+                if files.startswith("structure"):
+                    print "Changing toc paths in", files
+                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/")
+    else: print "no source directory",SASMODELS_SOURCE_REF_MODELS," was found"
 
     if os.path.exists(SASMODELS_SOURCE_MODELS):
@@ -320 +325 @@
                 tohere=os.path.join(SASMODELS_DEST_BUILDIMG,files)
                 shutil.copy(fromhere,tohere)
+    else: print "no source directory",SASMODELS_SOURCE_MODELS," was found.\n !!!!NO MODEL DOCS WILL BE BUILT!!!!"
 
 

setup.py

@@ -152 +152 @@
 
     def run(self):
+        ''' First builds the sasmodels documentation if the directory
+        is present. Then builds the sasview docs.
+        '''
+        ### AJJ - Add code for building sasmodels docs here:
+        # check for doc path
+        SASMODELS_PATH = '../sasmodels'
+        if os.path.exists(SASMODELS_PATH):
+            if os.path.isdir(SASMODELS_PATH):
+                # if available, build sasmodels docs
+            else:
+                # if not available warning message
+                print "WARNING!! sasmodels directory not found. Cannot build model docs."
+
+        #Now build sasview (+sasmodels) docs
         sys.path.append("docs/sphinx-docs")
         import build_sphinx