roc-film 1.14.7__py3-none-any.whl → 1.15.1__py3-none-any.whl

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.14.7",
-    "date": "2025-03-21",
+    "version": "1.15.1",
+    "date": "2025-06-02",
     "author": "Xavier Bonnin <xavier.bonnin@obspm.fr>, ROC Team <roc.support@sympa.obspm.fr>",
-    "modification": "Hotfix in db_to_anc_bia_sweep_table.py",
+    "modification": "Hotfix in merge_tcreport",
     "url": "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"
   },
   "tasks": [

roc/film/tasks/cdf_postpro.py

@@ -310,12 +310,12 @@ 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")
         cmd.append("-single")
-        cmd.append("-compression \"var:'Epoch':none\"")
+        cmd.append("-compressnonepoch")
         cmd.append("-checksum md5")
         cmd = " ".join(cmd)
 

roc/film/tasks/file_handler.py

@@ -6,6 +6,7 @@
 import os
 import shutil
 import uuid
+from pathlib import Path
 
 from poppy.core.logger import logger
 from poppy.core.task import Task
@@ -50,8 +51,8 @@ class MoveToProdDir(Task):
         # shall be moved
         products_dir = get_products_dir(self.pipeline)
 
-        # Ignore possible lock file in the output directory
-        ignore_patterns = ["*.lock"]
+        # Ignore possible items in the output directory
+        ignore_patterns = []
 
         if not products_dir:
             logger.debug(
@@ -63,6 +64,10 @@ class MoveToProdDir(Task):
             logger.debug(f"Moving {output_dir} into {products_dir}")
             if safe_move(output_dir, target_dir, ignore_patterns=ignore_patterns):
                 logger.info(f"{output_dir} moved into {products_dir}")
+                # Finally remove any lock file from target_dir
+                for current_lock in Path(target_dir).glob("*.lock"):
+                    current_lock.unlink(missing_ok=True)
+                    logger.debug(f"{current_lock} deleted")
 
         logger.debug(f"Task {self.job_id} completed")
 
@@ -92,7 +97,7 @@ class MoveFailedFiles(Task):
         logger.debug(f"Task {self.job_id} is starting")
         try:
             self.setup_inputs()
-        except Exception:
+        except Exception:  # noqa
             logger.exception(f"Initializing inputs has failed for {self.job_id}!")
             self.pipeline.exit()
             return

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/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)}"
+            )

roc/film/tools/file_helpers.py

@@ -55,6 +55,7 @@ __all__ = [
     "get_l0_file",
     "get_l0_files",
     "get_output_dir",
+    "get_products_dir",
     "get_master_cdf_dir",
     "is_output_dir",
     "get_files_datetime",

{roc_film-1.14.7.dist-info → roc_film-1.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: roc-film
-Version: 1.14.7
+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.14.7.dist-info → roc_film-1.15.1.dist-info}/RECORD

@@ -3,23 +3,23 @@ roc/film/__init__.py,sha256=XBPsnRsgcUjJnutv_tkgNViw2TqnA5ozO-bNO2HY-mg,143
 roc/film/commands.py,sha256=xzyARalgWc6mPfN5nUvDtqTzaovP2_Xbi6wCDsS4tVY,37019
 roc/film/config/__init__.py,sha256=Yh8cG85CwN7OIAndtBs213LZn5NwEjPjFYKpMnagJuc,68
 roc/film/constants.py,sha256=wDM0-UbKxNvs03uoabi0oHhOHNNNp8oPnBeRMkjXefc,4278
-roc/film/descriptor.json,sha256=9PdRwYmNRwEtavMeygopNTJgemW7rRanlNklEjcCp-0,33506
+roc/film/descriptor.json,sha256=Cc580LCZs_aeo9qK0B7DGt09RYlWkZ8F0n6GBE4JrNk,33492
 roc/film/exceptions.py,sha256=kGWP9VR_DjDdyZYC5gDixtvV7xAv7qEx5srzS4_8TlU,5177
 roc/film/tasks/__init__.py,sha256=GNuQAi7E9nOApSSUUg4DEKlY0OlOzVaJexFKK0h9A2c,961
 roc/film/tasks/cat_solo_hk.py,sha256=PX3HkyJCgFHrw_wwa44r_tWcXQ7jCbd6oiZGS8KRXfI,11227
-roc/film/tasks/cdf_postpro.py,sha256=55zrk4hVZCWBpIRIlq7s6W8qWAbPzQmmdemqhfN-jI8,25948
+roc/film/tasks/cdf_postpro.py,sha256=2SglpnexkgIarDNXcDCfi7Ypij6yh0fEWnBpFSqNAh8,25936
 roc/film/tasks/check_dds.py,sha256=pb0YZGu_cqPL2-Vi5aUaXAFJy86R2rOLVVaXnTLArug,3734
 roc/film/tasks/db_to_anc_bia_sweep_table.py,sha256=2_YYK39E9u5pR57Dkjz4jx6Wkyb2E4jCsep3F0EJ1aw,12789
 roc/film/tasks/dds_to_l0.py,sha256=nhsBESTlkEqiKAVVKek2oXe5neLFet1nTVsTiGTm1zY,22120
 roc/film/tasks/export_solo_coord.py,sha256=iuUfyQo3-vkdEdDsp2ZscFxsDVvdZJXxF0K-5IRQitw,5753
-roc/film/tasks/file_handler.py,sha256=T_zEVLMFpqCqmNsLQSMqLWQIYlQH3-ZBDgbl7yCJKWc,11121
+roc/film/tasks/file_handler.py,sha256=VtApUrSJu7zBSjJI_nXewGKtEA5B2OJzG4v3dAIDQaM,11391
 roc/film/tasks/l0_to_hk.py,sha256=bn9hYHmxGJWBuj_uYovkI9lnonQeplsr4_apxkK1YuA,11001
 roc/film/tasks/l0_to_l1_bia_current.py,sha256=GS6GvukagltY1CUW__b2CX-nBAYjOxxaatfppP5gmVg,2564
 roc/film/tasks/l0_to_l1_bia_sweep.py,sha256=VYjD_ml2M0K7WA7I4UKsmrm4cvxArYRBazmzuNs7_vs,34980
 roc/film/tasks/l0_to_l1_sbm.py,sha256=OjgMdCk7ldhs4mTlAxLVER_Cud6ILlBkW88a7P46ZSI,19219
 roc/film/tasks/l0_to_l1_surv.py,sha256=-n78s2r9aEAGw5U0LRd7NyiwdEehHufg5K4lEY4vR-k,15522
 roc/film/tasks/make_daily_tm.py,sha256=MX71TVmHOoIq-hD90BY_HCkRBQXXX2hSgbYLVa1e4cg,4453
-roc/film/tasks/merge_tcreport.py,sha256=olyc5wOgGqoWlbOJyuM0x_LMvRm5qfR11HPOIZYzplI,9723
+roc/film/tasks/merge_tcreport.py,sha256=Z8SpfC9BRE1k1V7UtWLy9FzbwQl-s0Y69GFaRT7c1zE,9728
 roc/film/tasks/merge_tmraw.py,sha256=leFLccWuw6ntQH0GwnsLfbISEIy7GftHoMtSdTyASgQ,12343
 roc/film/tasks/parse_dds_xml.py,sha256=UNhxURLPezdgip4wyPOVxFspMRV6ObNNRuer19H53kI,2114
 roc/film/tasks/set_l0_utc.py,sha256=6wAfoAsJLwyNrmh7YW0H9YwNps7hN69o20sqwxf1KLg,6054
@@ -35,16 +35,16 @@ roc/film/tests/test_l0_to_l1_bia.py,sha256=z1HIr3l2Aa75WmgfBObwUzyFMm5N34CJ2TiQ_
 roc/film/tests/test_l0_to_l1_sbm.py,sha256=fWhL9Z0DvJXrGrt7s7rWH7GYb8JvS75hqqMDEC2lbj0,4368
 roc/film/tests/test_l0_to_l1_surv.py,sha256=1zFIAnZrl-13jzQ3YOOcsiWpyINHZvkcZEI2HIpqda0,5101
 roc/film/tests/test_metadata.py,sha256=1nl5or5RPMsIgMqtvYz28qdZXVgjYw6olphMm6y8Wew,2508
-roc/film/tests/tests.py,sha256=boEPC42mZYQfinYE3jyol-7O34ttU5p_Ei0a_9YUHM4,44273
+roc/film/tests/tests.py,sha256=561F00VR6IhMmp5rIW2gsCHlg3gh4hIsf4NPkN2nlLc,44279
 roc/film/tools/__init__.py,sha256=dkYmLgy3b_B1T3ZZ6s_rv7NyDjLF0yOJPerjLEKAFlA,303
 roc/film/tools/dataset_tasks.py,sha256=CI9UIYchLwXfcjJoD8PsaFIcNX8akAsXz4RQ4hqhJeU,2825
-roc/film/tools/file_helpers.py,sha256=frCBNdIp9AOYnmVbhk9VE9hkDa1l9IGM7sQuhzjqf_U,31898
+roc/film/tools/file_helpers.py,sha256=x_KxZlQjarSwBmuIGq5OQIrY7ePtCUVuvik-6r3fzzo,31922
 roc/film/tools/l0.py,sha256=a5xxk3BYxtwOeZp36AoDPtF07VZpXfyKrpIYcC83u6w,46657
 roc/film/tools/metadata.py,sha256=gYFoo_VinBFoJOVIBwDfSqq0WvYTdDaS3NjEDtYREUM,12409
 roc/film/tools/skeleton.py,sha256=aTe6VWvy5Y79FuA3aKieTQ91m26PEvJ3MnzC4ZZqMvc,10765
 roc/film/tools/tools.py,sha256=b273WwDvxdowH9d8BqJX9REI3TpI7lzFsTviO23hzv4,18252
 roc/film/tools/xlsx2skt.py,sha256=sHmFLGuL1pT1N4V4Nk8i7yoHM2lveXphuvUUN28MvJs,19599
-roc_film-1.14.7.dist-info/LICENSE,sha256=TqI0k3vHsKpSR-Q2aQ0euTJIdbx1kOzeUL79OONRkKU,21778
-roc_film-1.14.7.dist-info/METADATA,sha256=b8UIsB0__iZsrttzY2Ga9NgD78awDXXnfELwjXGNB8c,1805
-roc_film-1.14.7.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-roc_film-1.14.7.dist-info/RECORD,,
+roc_film-1.15.1.dist-info/LICENSE,sha256=TqI0k3vHsKpSR-Q2aQ0euTJIdbx1kOzeUL79OONRkKU,21778
+roc_film-1.15.1.dist-info/METADATA,sha256=xRBvBvDHkh0_tV6C-uhAvow9yBU6Jq_xKk40rWqu1NA,1805
+roc_film-1.15.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+roc_film-1.15.1.dist-info/RECORD,,

{roc_film-1.14.7.dist-info → roc_film-1.15.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.1
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any