Changes in / [b768e92:ec30905] in sasview


Ignore:
Files:
3 added
6 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

    re791cca 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         { 
Note: See TracChangeset for help on using the changeset viewer.