roc-film 1.15.0__tar.gz → 1.15.1__tar.gz

{roc_film-1.15.0 → roc_film-1.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: roc-film
-Version: 1.15.0
+Version: 1.15.1
 Summary: RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files
 License: CECILL-2.1
 Author: Xavier Bonnin

{roc_film-1.15.0 → roc_film-1.15.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "roc-film"
-version = "1.15.0"
+version = "1.15.1"
 readme = "README.md"
 license = "CECILL-2.1"
 repository = "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"

{roc_film-1.15.0 → roc_film-1.15.1}/roc/film/descriptor.json

@@ -6,10 +6,10 @@
     "description": "RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files"
   },
   "release": {
-    "version": "1.15.0",
-    "date": "2025-04-29",
+    "version": "1.15.1",
+    "date": "2025-06-02",
     "author": "Xavier Bonnin <xavier.bonnin@obspm.fr>, ROC Team <roc.support@sympa.obspm.fr>",
-    "modification": "Add -compressnonepoch to cdfconvert in cdf_postpro",
+    "modification": "Hotfix in merge_tcreport",
     "url": "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"
   },
   "tasks": [

{roc_film-1.15.0 → roc_film-1.15.1}/roc/film/tasks/cdf_postpro.py

@@ -310,7 +310,7 @@ class CdfPostPro(Task):
 
         # Build command to run cdfconvert with subprocess.run
         cmd = list([self.cdfconvert, cdf_file, cdf_file])
-        # overwrite existing file
+        # overwrite the existing file
         cmd.append("-delete")
         # Force some CDF features
         cmd.append("-network")

{roc_film-1.15.0 → roc_film-1.15.1}/roc/film/tasks/merge_tcreport.py

@@ -239,7 +239,7 @@ class MergeTcReport(Task):
         # Make sure that returned output_tcreport_list is a list
         # (If only one PktTcReportListElement is found in the XML
         # the xml_to_dict method returns a collections.OrderedDict() instance).
-        if isinstance(output_tcreport_list, collections.OrderedDict):
+        if type(output_tcreport_list) is not list:
             output_tcreport_list = [output_tcreport_list]
 
         # return output as a dictionary of packet execution date keywords
@@ -249,7 +249,7 @@ class MergeTcReport(Task):
                 key = datetime.strptime(
                     current_tcreport["ExecutionTime"], TIME_ISO_STRFORMAT
                 ).date()
-            except Exception as e:
+            except (KeyError, TypeError, ValueError) as e:
                 logger.warning(f"Cannot get ExecutionTime for {current_tcreport}")
                 logger.debug(e)
                 if current_tcreport not in self.failed_tcreport:

{roc_film-1.15.0 → roc_film-1.15.1}/roc/film/tests/tests.py

@@ -1054,9 +1054,9 @@ class TestFilmFileProd(CommandTestCase):
         dirs_cmp.report()
 
         # ensure that we have the same files in both directories
-        assert (len(dirs_cmp.left_only) == 0) and (
-            len(dirs_cmp.right_only) == 0
-        ), "Different files in expected and generated output directories!"
+        assert (len(dirs_cmp.left_only) == 0) and (len(dirs_cmp.right_only) == 0), (
+            "Different files in expected and generated output directories!"
+        )
 
         for filename in self.get_diff_files(dirs_cmp):
             # compare only cdf files with differences
@@ -1083,9 +1083,9 @@ class TestFilmFileProd(CommandTestCase):
                 result = {}
 
             # compare the difference dict with the expected one
-            assert (
-                result == {}
-            ), f"Differences between expected output and the command output: {pformat(result)}"
+            assert result == {}, (
+                f"Differences between expected output and the command output: {pformat(result)}"
+            )
 
     @pytest.mark.parametrize(
         "idb_source,idb_version",
@@ -1185,9 +1185,9 @@ class TestFilmFileProd(CommandTestCase):
         dirs_cmp.report()
 
         # ensure that we have the same files in both directories
-        assert (len(dirs_cmp.left_only) == 0) and (
-            len(dirs_cmp.right_only) == 0
-        ), "Different files in expected and generated output directories!"
+        assert (len(dirs_cmp.left_only) == 0) and (len(dirs_cmp.right_only) == 0), (
+            "Different files in expected and generated output directories!"
+        )
 
         for filename in self.get_diff_files(dirs_cmp):
             # compare only cdf files with differences
@@ -1214,9 +1214,9 @@ class TestFilmFileProd(CommandTestCase):
                 result = {}
 
             # compare the difference dict with the expected one
-            assert (
-                result == {}
-            ), f"Differences between expected output and the command output: {pformat(result)}"
+            assert result == {}, (
+                f"Differences between expected output and the command output: {pformat(result)}"
+            )
 
     @pytest.mark.parametrize(
         "idb_source,idb_version",
@@ -1299,9 +1299,9 @@ class TestFilmFileProd(CommandTestCase):
         dirs_cmp.report()
 
         # ensure that we have the same files in both directories
-        assert (len(dirs_cmp.left_only) == 0) and (
-            len(dirs_cmp.right_only) == 0
-        ), "Different files in expected and generated output directories!"
+        assert (len(dirs_cmp.left_only) == 0) and (len(dirs_cmp.right_only) == 0), (
+            "Different files in expected and generated output directories!"
+        )
 
         for filename in self.get_diff_files(dirs_cmp):
             # compare only cdf files with differences
@@ -1328,6 +1328,6 @@ class TestFilmFileProd(CommandTestCase):
                 result = {}
 
             # compare the difference dict with the expected one
-            assert (
-                result == {}
-            ), f"Differences between expected output and the command output: {pformat(result)}"
+            assert result == {}, (
+                f"Differences between expected output and the command output: {pformat(result)}"
+            )