Changeset ec30905 in sasview


Ignore:
Timestamp:
Jun 15, 2016 10:32:29 AM (4 years ago)
Author:
Gonzalez, Miguel <gonzalez@…>
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:
dceff6e
Parents:
b768e92 (diff), 91afd87 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasview

Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • build_tools/requirements.txt

    r243fbc0 r785cc657  
    1616xhtml2pdf==0.0.6 
    1717sphinx==1.2.1 
     18h5py==2.5 
  • check_packages.py

    r96e151f r68aa210  
    2020    'html5lib':{'version':'0.95','import_name':'html5lib','test':'__version__'}, 
    2121    'reportlab':{'version':'2.5','import_name':'reportlab','test':'Version'}, 
     22    'h5py':{'version':'2.5','import_name':'h5py','test':'__version__'}, 
    2223    'lxml':{'version':'2.3','import_name':'lxml.etree','test':'LXML_VERSION'}, 
    2324    'PIL':{'version':'1.1.7','import_name':'Image','test':'VERSION'}, 
  • sasview/setup_exe.py

    r9528caa rabb02db  
    300300# 
    301301packages = [ 
    302     'matplotlib', 'scipy', 'encodings', 'comtypes', 
     302    'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py', 
    303303    'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas', 
    304304    ] 
  • sasview/setup_mac.py

    r7c752d0e r3d8e3c7  
    120120 
    121121#Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ) 
     122#h5py has been added to packages. It requires hdf5 to be installed separetly 
     123# 
    122124import __init__ as sasviewver 
    123125 
     
    134136           'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings', 
    135137                        'encodings','matplotlib', 'periodictable', 
    136                         'reportlab','sasmodels',"pyopencl" 
     138                        'reportlab','sasmodels',"pyopencl", "h5py" 
    137139                        ], 
    138140           'iconfile': ICON, 
  • setup.py

    r3371d81 r785cc657  
    302302 
    303303    # 'lxml>=2.2.2', 
    304     'lxml',  
     304    'lxml', 'h5py==2.5', 
    305305 
    306306    ## The following dependecies won't install automatically, so assume them 
  • src/sas/sascalc/dataloader/readers/defaults.json

    rb699768 r68aa210  
    99            "-extension":".ses", 
    1010            "-reader":"sesans_reader" 
     11         }, 
     12         { 
     13            "-extension":".h5", 
     14            "-reader":"cansas_reader_HDF5" 
    1115         }, 
    1216         { 
  • src/sas/sasgui/perspectives/fitting/models.py

    rcb4ef58 r6afc14b  
    147147    try: 
    148148        import compileall 
    149         compileall.compile_dir(dir=dir, ddir=dir, force=1, 
     149        compileall.compile_dir(dir=dir, ddir=dir, force=0, 
    150150                               quiet=report_problem) 
    151151    except: 
Note: See TracChangeset for help on using the changeset viewer.