Changeset 25a42f99 in sasview for installers

Timestamp:

Aug 29, 2017 5:34:30 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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

Children:

e912a58

Parents:

759a8ab

Message:

lint

Location:

installers

Files:

• setup_exe.py (modified) (7 diffs)
• setup_mac.py (modified) (5 diffs)

installers/setup_exe.py

@@ -62 +62 @@
         del sys.argv[path_flag_idx+1]
         sys.argv.remove('--extrapath')
-except:
+except Exception:
     print("Error processing extra python path needed to build SasView\n  %s" %
           sys.exc_value)
@@ -224 +224 @@
 sas_path = os.path.join('..', 'src', 'sas')
 DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')]))
-sasview_path = os.path.join(sas_path,'sasview')
+sasview_path = os.path.join(sas_path, 'sasview')
 config_files = [
     'custom_config.py',
@@ -260 +260 @@
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    DATA_FILES.append((os.path.join("test","1d_data"), [f]))
+    DATA_FILES.append((os.path.join("test", "1d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_2d_dir):
-    DATA_FILES.append((os.path.join("test","2d_data"), [f]))
+    DATA_FILES.append((os.path.join("test", "2d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_save_dir):
-    DATA_FILES.append((os.path.join("test","save_states"), [f]))
+    DATA_FILES.append((os.path.join("test", "save_states"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_upcoming_dir):
-    DATA_FILES.append((os.path.join("test","upcoming_formats"), [f]))
+    DATA_FILES.append((os.path.join("test", "upcoming_formats"), [f]))
 
 # Copying opencl include files
@@ -278 +278 @@
 opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl")
 for f in findall(opencl_include_dir):
-    DATA_FILES.append((os.path.join("includes","pyopencl"), [f]))
+    DATA_FILES.append((os.path.join("includes", "pyopencl"), [f]))
 
 # Numerical libraries
@@ -319 +319 @@
 packages = [
     'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py',
-    'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas',
+    'win32com', 'xhtml2pdf', 'bumps', 'sasmodels', 'sas',
     ]
 packages.extend([
@@ -336 +336 @@
 
 # For an interactive interpreter, SasViewCom
-packages.extend(['IPython','pyreadline','pyreadline.unicode_helper'])
+packages.extend(['IPython', 'pyreadline', 'pyreadline.unicode_helper'])
 
 # individual models
@@ -365 +365 @@
 
 target_wx_client = Target(
-    description = 'SasView',
-    script = 'sasview_gui.py',
-    icon_resources = [(1, local_config.SetupIconFile_win)],
-    other_resources = [(24, 1, manifest)],
-    dest_base = "SasView"
+    description='SasView',
+    script='sasview_gui.py',
+    icon_resources=[(1, local_config.SetupIconFile_win)],
+    other_resources=[(24, 1, manifest)],
+    dest_base="SasView"
 )
 
 target_console_client = Target(
-    description = 'SasView console',
-    script = 'sasview_console.py',
-    icon_resources = [(1, local_config.SetupIconFile_win)],
-    other_resources = [(24, 1, manifest)],
-    dest_base = "SasViewCom"
+    description='SasView console',
+    script='sasview_console.py',
+    icon_resources=[(1, local_config.SetupIconFile_win)],
+    other_resources=[(24, 1, manifest)],
+    dest_base="SasViewCom"
 )
 

installers/setup_mac.py

@@ -7 +7 @@
 
 NOTES:
-   12/01/2011: When seeing an error related to pytz.zoneinfo not being found, change the following line in py2app/recipes/matplotlib.py
+   12/01/2011: When seeing an error related to pytz.zoneinfo not being found,
+               change the following line in py2app/recipes/matplotlib.py
                mf.import_hook('pytz.tzinfo', m, ['UTC'])
    12/05/2011: Needs macholib >= 1.4.3 and py2app >= 0.6.4 to create a 64-bit app
@@ -59 +60 @@
 #CANSAxml reader data files
 from sas.sascalc.dataloader import readers
-RESOURCES_FILES.append(os.path.join(readers.get_data_path(),'defaults.json'))
+RESOURCES_FILES.append(os.path.join(readers.get_data_path(), 'defaults.json'))
 
 # Copy the config files
 sas_path = os.path.join('..', 'src', 'sas')
 DATA_FILES.append(('.', [os.path.join(sas_path, 'logging.ini')]))
-sasview_path = os.path.join(sas_path,'sasview')
+sasview_path = os.path.join(sas_path, 'sasview')
 custom_config_file = os.path.join(sasview_path, 'custom_config.py')
 local_config_file = os.path.join(sasview_path, 'local_config.py')
@@ -99 +100 @@
 # Copying the sample data user data
 for f in findall(test_1d_dir):
-    DATA_FILES.append((os.path.join("test","1d_data"), [f]))
+    DATA_FILES.append((os.path.join("test", "1d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_2d_dir):
-    DATA_FILES.append((os.path.join("test","2d_data"), [f]))
+    DATA_FILES.append((os.path.join("test", "2d_data"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_save_dir):
-    DATA_FILES.append((os.path.join("test","save_states"), [f]))
+    DATA_FILES.append((os.path.join("test", "save_states"), [f]))
 
 # Copying the sample data user data
 for f in findall(test_upcoming_dir):
-    DATA_FILES.append((os.path.join("test","upcoming_formats"), [f]))
+    DATA_FILES.append((os.path.join("test", "upcoming_formats"), [f]))
 
 # Copying opencl include files
@@ -117 +118 @@
 opencl_include_dir = os.path.join(site_loc, "pyopencl", "cl")
 for f in findall(opencl_include_dir):
-    DATA_FILES.append((os.path.join("includes","pyopencl"), [f]))
+    DATA_FILES.append((os.path.join("includes", "pyopencl"), [f]))
 
 # See if the documentation has been built, and if so include it.
@@ -167 +168 @@
 plist = dict(CFBundleDocumentTypes=[dict(CFBundleTypeExtensions=EXTENSIONS_LIST,
                                          CFBundleTypeIconFile=ICON,
-                                   CFBundleTypeName="sasview file",
-                                   CFBundleTypeRole="Shell" )],)
+                                         CFBundleTypeName="sasview file",
+                                         CFBundleTypeRole="Shell")],)
 
 # Locate libxml2 library