Merge d7ab12f into 6749b65

BCDA-APS · Aug 15, 2019 · 6c6a97b · 6c6a97b
2 parents 6749b65 + d7ab12f
commit 6c6a97b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,8 +4,10 @@
 Change History
 ##############
 
-:1.1.12:  expected *2019-08-16* : 
+:1.1.13:  expected *2019-08-16* : enhancements, bug fix, rename
 
+    * `#224 <https://github.com/prjemian/spec2nexus/issues/224>`_
+       rename: list_recent_scans --> catalog
     * `#222 <https://github.com/prjemian/spec2nexus/issues/222>`_
        writer: add empty #O0 and #P0 lines
     * `#220 <https://github.com/prjemian/spec2nexus/issues/220>`_

diff --git a/requirements.txt b/requirements.txt
@@ -7,5 +7,5 @@ jsonschema>3
 ophyd
 pandas
 pyRestTable
-spec2nexus
+spec2nexus>=2021.1.2
 xlrd
diff --git a/tests/test_filewriter.py b/tests/test_filewriter.py
@@ -119,29 +119,18 @@ def test_writer_default_name(self):
         self.assertIn("108", scans)
         scan = sdf.getScan(108)
         self.assertEqual(scan.N[0], len(scan.L))
-
+        
         self.assertGreater(scan.header.raw.find("\n#O0 \n"), 0)
         self.assertGreater(scan.header.raw.find("\n#o0 \n"), 0)
-
-        # see: https://github.com/prjemian/spec2nexus/issues/196
-        # tests/test_plugin.py  test_empty_positioner()
         self.assertEqual(len(scan.header.O), 1)
-        self.assertEqual(scan.header.O[0], [''])
+        self.assertEqual(len(scan.header.O[0]), 0)
+        self.assertEqual(len(scan.header.o), 1)
+        self.assertEqual(len(scan.header.o[0]), 0)
+
         self.assertGreater(scan.raw.find("\n#P0 \n"), 0)
         self.assertEqual(len(scan.P), 1)
-        self.assertEqual(scan.P[0], '')
-
-        # TODO: after next spec2nexus release 
-        # self.assertGreater(scan.header.raw.find("\n#O0 \n"), 0)
-        # self.assertGreater(scan.header.raw.find("\n#o0 \n"), 0)
-        # self.assertEqual(len(scan.header.O), 1)
-        # self.assertEqual(len(scan.header.O[0]), 0)
-        # self.assertEqual(len(scan.header.o), 1)
-        # self.assertEqual(len(scan.header.o[0]), 0)
-        # self.assertGreater(scan.raw.find("\n#P0 \n"), 0)
-        # self.assertEqual(len(scan.P), 1)
-        # self.assertEqual(len(scan.P[0]), 0)
-        # self.assertEqual(len(scan.positioner), 0)
+        self.assertEqual(len(scan.P[0]), 0)
+        self.assertEqual(len(scan.positioner), 0)
 
     def test_writer_filename(self):
         self.assertTrue(len(self.db) > 0, "test data ready")