Changeset ec30905 in sasview

Timestamp:

Jun 15, 2016 10:32:29 AM (8 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:

• build_tools/Makefile_RHEL7 (added)
• build_tools/requirements.txt (modified) (1 diff)
• build_tools/sasview.spec (added)
• check_packages.py (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)
• sasview/setup_mac.py (modified) (2 diffs)
• 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)
• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

build_tools/requirements.txt

@@ -16 +16 @@
 xhtml2pdf==0.0.6
 sphinx==1.2.1
+h5py==2.5

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'},

sasview/setup_exe.py

@@ -300 +300 @@
 #
 packages = [
-    'matplotlib', 'scipy', 'encodings', 'comtypes',
+    'matplotlib', 'scipy', 'encodings', 'comtypes', 'h5py',
     'win32com', 'xhtml2pdf', 'bumps','sasmodels', 'sas',
     ]

sasview/setup_mac.py

@@ -120 +120 @@
 
 #Get version - NB nasty hack. Need to find correct way to give path to installed sasview (AJJ)
+#h5py has been added to packages. It requires hdf5 to be installed separetly
+#
 import __init__ as sasviewver
 
@@ -134 +136 @@
            'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings',
                         'encodings','matplotlib', 'periodictable',
-                        'reportlab','sasmodels',"pyopencl"
+                        'reportlab','sasmodels',"pyopencl", "h5py"
                         ],
            'iconfile': ICON,

setup.py

@@ -302 +302 @@
 
     # 'lxml>=2.2.2',
-    'lxml', 
+    'lxml', 'h5py==2.5',
 
     ## 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"
          },
          {

src/sas/sasgui/perspectives/fitting/models.py

@@ -147 +147 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: