Changeset a7c4ad2 in sasview


Ignore:
Timestamp:
Apr 26, 2016 2:41:22 AM (8 years ago)
Author:
trnielsen
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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
628acad
Parents:
243fbc0
Message:

Fixed some Windows issues for setupSasView.exe by reversing earlier commits

Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • sasview/setup_exe.py

    r40fc798 ra7c4ad2  
    256256data_files += guiframe.data_files() 
    257257 
    258 import sas.models as models 
     258#import sas.models as models 
     259import sasmodels.models as models 
    259260data_files += models.data_files() 
    260261 
     
    338339packages = [ 
    339340    'matplotlib', 'scipy', 'encodings', 'comtypes', 
    340     'win32com', 'xhtml2pdf', 'bumps', 
     341    'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas', 
    341342    ] 
    342343packages.extend([ 
  • setup.py

    r243fbc0 ra7c4ad2  
    249249 
    250250package_dir["sas.sasgui.perspectives.fitting"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting") 
    251 packages.extend(["sas.sasgui.perspectives.fitting"]) 
    252 package_data['sas.sasgui.perspectives.fitting'] = ['media/*'] 
     251package_dir["sas.sasgui.perspectives.fitting.plugin_models"] = os.path.join("src", "sas", "sasgui", "perspectives", "fitting", "plugin_models") 
     252packages.extend(["sas.sasgui.perspectives.fitting", "sas.sasgui.perspectives.fitting.plugin_models"]) 
     253package_data['sas.sasgui.perspectives.fitting'] = ['media/*', 'plugin_models/*'] 
    253254 
    254255packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"]) 
  • src/sas/sasgui/perspectives/fitting/__init__.py

    r9e531f2 ra7c4ad2  
    3939    data_files = [] 
    4040    path = os.path.dirname(__file__) 
    41     # p_path = os.path.join(path, 'plugin_models') 
    42     # for f in findall(p_path): 
    43     #     data_files.append(('plugin_models', [f])) 
     41    p_path = os.path.join(path, 'plugin_models') 
     42    for f in findall(p_path): 
     43        data_files.append(('plugin_models', [f])) 
    4444    # path = get_data_path(media="media") 
    4545    for f in findall(path): 
Note: See TracChangeset for help on using the changeset viewer.