Changeset 8effabe in sasview

Timestamp:

Jun 8, 2016 8:59:19 AM (9 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:

abb02db, 785cc657

Parents:

ae308a4 (diff), 7235c57 (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:

• build_tools/Makefile_RHEL7 (added)
• build_tools/sasview.spec (added)
• check_packages.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (added)
• src/sas/sascalc/dataloader/readers/defaults.json (modified) (1 diff)

check_packages.py

@@ -20 +20 @@
     'html5lib':{'version':'0.95','import_name':'html5lib','test':'__version__'},
     'reportlab':{'version':'2.5','import_name':'reportlab','test':'Version'},
+    'h5py':{'version':'2.5','import_name':'h5py','test':'__version__'},
     'lxml':{'version':'2.3','import_name':'lxml.etree','test':'LXML_VERSION'},
     'PIL':{'version':'1.1.7','import_name':'Image','test':'VERSION'},

setup.py

@@ -302 +302 @@
 
     # 'lxml>=2.2.2',
-    'lxml', 
+    'lxml', 'h5py',
 
     ## The following dependecies won't install automatically, so assume them

src/sas/sascalc/dataloader/readers/defaults.json

@@ -9 +9 @@
             "-extension":".ses",
             "-reader":"sesans_reader"
+         },
+         {
+            "-extension":".h5",
+            "-reader":"cansas_reader_HDF5"
          },
          {