Changeset 2815471 in sasview


Ignore:
Timestamp:
Jun 9, 2016 8:49:11 AM (4 years ago)
Author:
krzywon
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:
a929b6b
Parents:
785cc657 (diff), abb02db (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 remote-tracking branch 'origin/master'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • 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    ] 
  • build_tools/requirements.txt

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

    rae308a4 r785cc657  
    302302 
    303303    # 'lxml>=2.2.2', 
    304     'lxml', 'h5py', 
     304    'lxml', 'h5py==2.5', 
    305305 
    306306    ## The following dependecies won't install automatically, so assume them 
Note: See TracChangeset for help on using the changeset viewer.