Changes in / [8effabe:7235c57] in sasview

Files:

• check_packages.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (deleted)
• 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', 'h5py',
+    'lxml', 
 
     ## 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"
          },
          {