Changeset 156203a in sasview

Timestamp:

Aug 30, 2017 5:42:31 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:

0046c6a

Parents:

edf7dc6

Message:

default_categories.json was removed from installer

Location:

installers

Files:

• setup_exe.py (modified) (1 diff)
• setup_mac.py (modified) (1 diff)

installers/setup_exe.py

@@ -228 +228 @@
     'custom_config.py',
     'local_config.py',
-    #'default_categories.json',
     ]
 DATA_FILES.append(('.', [os.path.join(sasview_path, v) for v in config_files]))
 DATA_FILES.append(('config', [os.path.join(sasview_path, 'custom_config.py')]))
-
-# default_categories.json is beside the config files
-category_config = os.path.join(os.path.dirname(local_config_file),
-                               'default_categories.json')
-if os.path.isfile(category_config):
-    DATA_FILES.append(('.', [category_config]))
 
 if os.path.isfile("BUILD_NUMBER"):

installers/setup_mac.py

@@ -73 +73 @@
 DATA_FILES.append(('.', [local_config_file]))
 DATA_FILES.append(('.', [logging_ini]))
-
-# default_categories.json is beside the config files
-category_config = os.path.join(sasview_path, 'default_categories.json')
-if os.path.isfile(category_config):
-    DATA_FILES.append(('.', [category_config]))
 
 if os.path.isfile("BUILD_NUMBER"):