Changeset 202a4ce9 in sasview

Timestamp:

Oct 18, 2017 8:40:42 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

0056a05e

Parents:

75fff69

Message:

Fixed embarrassing stash apply error

File:

• installers/setup_exe.py (modified) (2 diffs, 1 prop)

installers/setup_exe.py

@@ -206 +206 @@
 data_files += calculator.data_files()
 
-<<<<<<< Updated upstream:installers/setup_exe.py
 from sas.sasgui.perspectives import invariant
 data_files += invariant.data_files()
-=======
-python_root = os.path.dirname(os.path.abspath(sys.executable))
-
-# Check for ATLAS
-dll_path = os.path.join(python_root, 'lib', 'site-packages', 'numpy', 'core')
-dlls = ['numpy-atlas']
-atlas_dlls = dll_check(dll_path, dlls)
->>>>>>> Stashed changes:sasview/setup_exe.py
 
 from sas.sasgui import guiframe
 data_files += guiframe.data_files()
 
-<<<<<<< Updated upstream:installers/setup_exe.py
 # Copy the config files
 sasview_path = os.path.join('..', 'src', 'sas', 'sasview')
@@ -231 +221 @@
 sas_path = os.path.join('..', 'src', 'sas')
 data_files.append(('.', [os.path.join(sas_path, 'logging.ini')]))
-=======
-if mkl_dlls:
-    data_files.append(('.', atlas_dlls))
-elif atlas_dlls:
-    data_files.append(('.', mkl_dlls))
->>>>>>> Stashed changes:sasview/setup_exe.py
 
 if os.path.isfile("BUILD_NUMBER"):