Changeset 14bb7a4 in sasview

Timestamp:

Apr 11, 2017 7:49:03 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:

7b15990

Parents:

01f1e17

Message:

Fixing spaces after commas issue

File:

• setup.py (modified) (5 diffs)

setup.py

@@ -158 +158 @@
         ### 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,"============")
+        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"])
+                smdocbuild = subprocess.call(["make", "-C", SASMODELS_DOCPATH, "html"])
         else:
             # if not available warning message
@@ -198 +198 @@
 # build local plugin
 for d in os.listdir(os.path.join(guiframe_path, "local_perspectives")):
-    if d not in ['.svn','__init__.py', '__init__.pyc']:
+    if d not in ['.svn', '__init__.py', '__init__.pyc']:
         package_name = "sas.sasgui.guiframe.local_perspectives." + d
         packages.append(package_name)
@@ -205 +205 @@
 # sas.sascalc.dataloader
 package_dir["sas.sascalc.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader")
-package_data["sas.sascalc.dataloader.readers"] = ['defaults.json','schema/*.xsd']
-packages.extend(["sas.sascalc.dataloader","sas.sascalc.dataloader.readers","sas.sascalc.dataloader.readers.schema"])
+package_data["sas.sascalc.dataloader.readers"] = ['defaults.json', 'schema/*.xsd']
+packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers", "sas.sascalc.dataloader.readers.schema"])
 
 # sas.sascalc.calculator
@@ -227 +227 @@
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
 package_dir["sas.sascalc.pr.core"] = srcdir
-package_dir["sas.sascalc.pr"] = os.path.join("src","sas", "sascalc", "pr")
+package_dir["sas.sascalc.pr"] = os.path.join("src", "sas", "sascalc", "pr")
 packages.extend(["sas.sascalc.pr","sas.sascalc.pr.core"])
 ext_modules.append( Extension("sas.sascalc.pr.core.pr_inversion",
@@ -239 +239 @@
 mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
 package_dir["sas.sascalc.file_converter.core"] = mydir
-package_dir["sas.sascalc.file_converter"] = os.path.join("src","sas", "sascalc", "file_converter")
-packages.extend(["sas.sascalc.file_converter","sas.sascalc.file_converter.core"])
+package_dir["sas.sascalc.file_converter"] = os.path.join("src", "sas", "sascalc", "file_converter")
+packages.extend(["sas.sascalc.file_converter", "sas.sascalc.file_converter.core"])
 ext_modules.append( Extension("sas.sascalc.file_converter.core.bsl_loader",
                               sources = [os.path.join(mydir, "bsl_loader.c")],