Changeset b854587 in sasview for setup.py

Timestamp:

Apr 11, 2017 6:01:57 AM (7 years ago)

Author:

GitHub <noreply@…>

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:

7b15990

Parents:

f36e01f (diff), a42fb8e (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.

git-author:

Andrew Jackson <andrew.jackson@…> (04/11/17 06:01:57)

git-committer:

GitHub <noreply@…> (04/11/17 06:01:57)

Message:

Merge branch 'master' into pytest

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -8 +8 @@
 
 import os
+import subprocess
 import shutil
 import sys
@@ -162 +163 @@
 
     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_DOCPATH = os.path.abspath(os.path.join(os.getcwd(), '..', 'sasmodels', 'doc'))
+        print("========= check for sasmodels at", SASMODELS_DOCPATH, "============")
+        if os.path.exists(SASMODELS_DOCPATH):
+            if os.path.isdir(SASMODELS_DOCPATH):
+                # if available, build sasmodels docs
+                print("============= Building sasmodels model documentation ===============")
+                smdocbuild = subprocess.call(["make", "-C", SASMODELS_DOCPATH, "html"])
+        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
@@ -207 +225 @@
 packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers",
                  "sas.sascalc.dataloader.readers.schema"])
+
 
 # sas.sascalc.calculator
@@ -237 +256 @@
                              ))
 
+
 # sas.sascalc.file_converter
 mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
@@ -252 +272 @@
 package_dir["sas.sascalc.corfunc"] = os.path.join(
     "src", "sas", "sascalc", "corfunc")
+
 packages.extend(["sas.sascalc.corfunc"])