Merge pull request #56 from SasView/rc_4_1_issues

Release: Save state and test data
SasView · Mar 28, 2017 · 2de2352 · 2de2352
2 parents 9146ed9 + 8434365
commit 2de2352
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -314,9 +314,14 @@ def append_file(file_list, dir_path):
                                'test/*.txt',
                                'test/1d_data/*',
                                'test/2d_data/*',
+                               'test/convertible_files/*',
+                               'test/coordinate_data/*',
+                               'test/image_data/*',
+                               'test/media/*',
+                               'test/other_files/*',
                                'test/save_states/*',
-                               'test/upcoming_formats/*',
-                                 'default_categories.json']
+                               'test/sesans_data/*'
+                               ]
 packages.append("sas.sasview")
 
 required = [

diff --git a/src/sas/sascalc/dataloader/readers/cansas_reader.py b/src/sas/sascalc/dataloader/readers/cansas_reader.py
@@ -929,7 +929,8 @@ def _to_xml_doc(self, datainfo):
         else:
             self._write_data(datainfo, entry_node)
         # Transmission Spectrum Info
-        self._write_trans_spectrum(datainfo, entry_node)
+        # TODO: fix the writer to linearize all data, including T_spectrum
+        # self._write_trans_spectrum(datainfo, entry_node)
         # Sample info
         self._write_sample_info(datainfo, entry_node)
         # Instrument info

diff --git a/src/sas/sasgui/perspectives/fitting/pagestate.py b/src/sas/sasgui/perspectives/fitting/pagestate.py
@@ -818,7 +818,7 @@ def to_xml(self, file="fitting_state.fitv", doc=None,
                     entry_node.appendChild(top_element)
 
         attr = newdoc.createAttribute("version")
-        import sasview
+        from sas import sasview
         attr.nodeValue = sasview.__version__
         # attr.nodeValue = '1.0'
         top_element.setAttributeNode(attr)