Changeset 14bb7a4 in sasview for setup.py


Ignore:
Timestamp:
Apr 11, 2017 7:49:03 AM (2 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:
1 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r21bba86 r14bb7a4  
    158158        ### AJJ - Add code for building sasmodels docs here: 
    159159        # check for doc path 
    160         SASMODELS_DOCPATH = os.path.abspath(os.path.join(os.getcwd(),'..','sasmodels','doc')) 
    161         print("========= check for sasmodels at",SASMODELS_DOCPATH,"============") 
     160        SASMODELS_DOCPATH = os.path.abspath(os.path.join(os.getcwd(), '..', 'sasmodels', 'doc')) 
     161        print("========= check for sasmodels at", SASMODELS_DOCPATH, "============") 
    162162        if os.path.exists(SASMODELS_DOCPATH): 
    163163            if os.path.isdir(SASMODELS_DOCPATH): 
    164164                # if available, build sasmodels docs 
    165165                print("============= Building sasmodels model documentation ===============") 
    166                 smdocbuild = subprocess.call(["make","-C",SASMODELS_DOCPATH,"html"]) 
     166                smdocbuild = subprocess.call(["make", "-C", SASMODELS_DOCPATH, "html"]) 
    167167        else: 
    168168            # if not available warning message 
     
    198198# build local plugin 
    199199for d in os.listdir(os.path.join(guiframe_path, "local_perspectives")): 
    200     if d not in ['.svn','__init__.py', '__init__.pyc']: 
     200    if d not in ['.svn', '__init__.py', '__init__.pyc']: 
    201201        package_name = "sas.sasgui.guiframe.local_perspectives." + d 
    202202        packages.append(package_name) 
     
    205205# sas.sascalc.dataloader 
    206206package_dir["sas.sascalc.dataloader"] = os.path.join("src", "sas", "sascalc", "dataloader") 
    207 package_data["sas.sascalc.dataloader.readers"] = ['defaults.json','schema/*.xsd'] 
    208 packages.extend(["sas.sascalc.dataloader","sas.sascalc.dataloader.readers","sas.sascalc.dataloader.readers.schema"]) 
     207package_data["sas.sascalc.dataloader.readers"] = ['defaults.json', 'schema/*.xsd'] 
     208packages.extend(["sas.sascalc.dataloader", "sas.sascalc.dataloader.readers", "sas.sascalc.dataloader.readers.schema"]) 
    209209 
    210210# sas.sascalc.calculator 
     
    227227srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions") 
    228228package_dir["sas.sascalc.pr.core"] = srcdir 
    229 package_dir["sas.sascalc.pr"] = os.path.join("src","sas", "sascalc", "pr") 
     229package_dir["sas.sascalc.pr"] = os.path.join("src", "sas", "sascalc", "pr") 
    230230packages.extend(["sas.sascalc.pr","sas.sascalc.pr.core"]) 
    231231ext_modules.append( Extension("sas.sascalc.pr.core.pr_inversion", 
     
    239239mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext") 
    240240package_dir["sas.sascalc.file_converter.core"] = mydir 
    241 package_dir["sas.sascalc.file_converter"] = os.path.join("src","sas", "sascalc", "file_converter") 
    242 packages.extend(["sas.sascalc.file_converter","sas.sascalc.file_converter.core"]) 
     241package_dir["sas.sascalc.file_converter"] = os.path.join("src", "sas", "sascalc", "file_converter") 
     242packages.extend(["sas.sascalc.file_converter", "sas.sascalc.file_converter.core"]) 
    243243ext_modules.append( Extension("sas.sascalc.file_converter.core.bsl_loader", 
    244244                              sources = [os.path.join(mydir, "bsl_loader.c")], 
Note: See TracChangeset for help on using the changeset viewer.