roc-film 1.14.6__py3-none-any.whl → 1.15.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. roc/film/descriptor.json +3 -3
  2. roc/film/tasks/cdf_postpro.py +1 -1
  3. roc/film/tasks/db_to_anc_bia_sweep_table.py +2 -2
  4. roc/film/tasks/file_handler.py +8 -3
  5. roc/film/tools/file_helpers.py +1 -0
  6. {roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/METADATA +1 -1
  7. {roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/RECORD +9 -9
  8. {roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/WHEEL +1 -1
  9. {roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/LICENSE +0 -0
roc/film/descriptor.json CHANGED
@@ -6,10 +6,10 @@
6
6
  "description": "RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files"
7
7
  },
8
8
  "release": {
9
- "version": "1.14.6",
10
- "date": "2025-03-20",
9
+ "version": "1.15.0",
10
+ "date": "2025-04-29",
11
11
  "author": "Xavier Bonnin <xavier.bonnin@obspm.fr>, ROC Team <roc.support@sympa.obspm.fr>",
12
- "modification": "Change Parents setting in l0_to_trange_cdf",
12
+ "modification": "Add -compressnonepoch to cdfconvert in cdf_postpro",
13
13
  "url": "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"
14
14
  },
15
15
  "tasks": [
roc/film/tasks/cdf_postpro.py CHANGED
@@ -315,7 +315,7 @@ class CdfPostPro(Task):
315
315
  # Force some CDF features
316
316
  cmd.append("-network")
317
317
  cmd.append("-single")
318
- cmd.append("-compression \"var:'Epoch':none\"")
318
+ cmd.append("-compressnonepoch")
319
319
  cmd.append("-checksum md5")
320
320
  cmd = " ".join(cmd)
321
321
 
roc/film/tasks/db_to_anc_bia_sweep_table.py CHANGED
@@ -118,13 +118,13 @@ class DbToAncBiaSweepTable(Task):
118
118
  # Get start_time input value
119
119
  self.start_time = valid_time(
120
120
  self.pipeline.get("start_time", default=[None])[0],
121
- format=TIME_DAILY_STRFORMAT,
121
+ str_format=TIME_DAILY_STRFORMAT,
122
122
  )
123
123
 
124
124
  # Get end_time input value
125
125
  self.end_time = valid_time(
126
126
  self.pipeline.get("end_time", default=[None])[0],
127
- format=TIME_DAILY_STRFORMAT,
127
+ str_format=TIME_DAILY_STRFORMAT,
128
128
  )
129
129
 
130
130
  # Define query filters for existing data in database
roc/film/tasks/file_handler.py CHANGED
@@ -6,6 +6,7 @@
6
6
  import os
7
7
  import shutil
8
8
  import uuid
9
+ from pathlib import Path
9
10
 
10
11
  from poppy.core.logger import logger
11
12
  from poppy.core.task import Task
@@ -50,8 +51,8 @@ class MoveToProdDir(Task):
50
51
  # shall be moved
51
52
  products_dir = get_products_dir(self.pipeline)
52
53
 
53
- # Ignore possible lock file in the output directory
54
- ignore_patterns = ["*.lock"]
54
+ # Ignore possible items in the output directory
55
+ ignore_patterns = []
55
56
 
56
57
  if not products_dir:
57
58
  logger.debug(
@@ -63,6 +64,10 @@ class MoveToProdDir(Task):
63
64
  logger.debug(f"Moving {output_dir} into {products_dir}")
64
65
  if safe_move(output_dir, target_dir, ignore_patterns=ignore_patterns):
65
66
  logger.info(f"{output_dir} moved into {products_dir}")
67
+ # Finally remove any lock file from target_dir
68
+ for current_lock in Path(target_dir).glob("*.lock"):
69
+ current_lock.unlink(missing_ok=True)
70
+ logger.debug(f"{current_lock} deleted")
66
71
 
67
72
  logger.debug(f"Task {self.job_id} completed")
68
73
 
@@ -92,7 +97,7 @@ class MoveFailedFiles(Task):
92
97
  logger.debug(f"Task {self.job_id} is starting")
93
98
  try:
94
99
  self.setup_inputs()
95
- except Exception:
100
+ except Exception: # noqa
96
101
  logger.exception(f"Initializing inputs has failed for {self.job_id}!")
97
102
  self.pipeline.exit()
98
103
  return
roc/film/tools/file_helpers.py CHANGED
@@ -55,6 +55,7 @@ __all__ = [
55
55
  "get_l0_file",
56
56
  "get_l0_files",
57
57
  "get_output_dir",
58
+ "get_products_dir",
58
59
  "get_master_cdf_dir",
59
60
  "is_output_dir",
60
61
  "get_files_datetime",
{roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: roc-film
3
- Version: 1.14.6
3
+ Version: 1.15.0
4
4
  Summary: RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files
5
5
  License: CECILL-2.1
6
6
  Author: Xavier Bonnin
{roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/RECORD RENAMED
@@ -3,16 +3,16 @@ roc/film/__init__.py,sha256=XBPsnRsgcUjJnutv_tkgNViw2TqnA5ozO-bNO2HY-mg,143
3
3
  roc/film/commands.py,sha256=xzyARalgWc6mPfN5nUvDtqTzaovP2_Xbi6wCDsS4tVY,37019
4
4
  roc/film/config/__init__.py,sha256=Yh8cG85CwN7OIAndtBs213LZn5NwEjPjFYKpMnagJuc,68
5
5
  roc/film/constants.py,sha256=wDM0-UbKxNvs03uoabi0oHhOHNNNp8oPnBeRMkjXefc,4278
6
- roc/film/descriptor.json,sha256=cgF6R-hYAnTNarJAy1HjfbDt0FFn35raYd67lnxn6UA,33510
6
+ roc/film/descriptor.json,sha256=4Y1ZTpPI4DsCAl2PK3Kx9sAAojB8PjARk0VxF_EDmic,33518
7
7
  roc/film/exceptions.py,sha256=kGWP9VR_DjDdyZYC5gDixtvV7xAv7qEx5srzS4_8TlU,5177
8
8
  roc/film/tasks/__init__.py,sha256=GNuQAi7E9nOApSSUUg4DEKlY0OlOzVaJexFKK0h9A2c,961
9
9
  roc/film/tasks/cat_solo_hk.py,sha256=PX3HkyJCgFHrw_wwa44r_tWcXQ7jCbd6oiZGS8KRXfI,11227
10
- roc/film/tasks/cdf_postpro.py,sha256=55zrk4hVZCWBpIRIlq7s6W8qWAbPzQmmdemqhfN-jI8,25948
10
+ roc/film/tasks/cdf_postpro.py,sha256=2TzJYl4DXlZ1lEdv5NYif80f7l216arPyXsT750tsoY,25932
11
11
  roc/film/tasks/check_dds.py,sha256=pb0YZGu_cqPL2-Vi5aUaXAFJy86R2rOLVVaXnTLArug,3734
12
- roc/film/tasks/db_to_anc_bia_sweep_table.py,sha256=o-rJpj1VzS9azAT_EiWL9fxaZQt2qaArKtGiLMHv3S4,12781
12
+ roc/film/tasks/db_to_anc_bia_sweep_table.py,sha256=2_YYK39E9u5pR57Dkjz4jx6Wkyb2E4jCsep3F0EJ1aw,12789
13
13
  roc/film/tasks/dds_to_l0.py,sha256=nhsBESTlkEqiKAVVKek2oXe5neLFet1nTVsTiGTm1zY,22120
14
14
  roc/film/tasks/export_solo_coord.py,sha256=iuUfyQo3-vkdEdDsp2ZscFxsDVvdZJXxF0K-5IRQitw,5753
15
- roc/film/tasks/file_handler.py,sha256=T_zEVLMFpqCqmNsLQSMqLWQIYlQH3-ZBDgbl7yCJKWc,11121
15
+ roc/film/tasks/file_handler.py,sha256=VtApUrSJu7zBSjJI_nXewGKtEA5B2OJzG4v3dAIDQaM,11391
16
16
  roc/film/tasks/l0_to_hk.py,sha256=bn9hYHmxGJWBuj_uYovkI9lnonQeplsr4_apxkK1YuA,11001
17
17
  roc/film/tasks/l0_to_l1_bia_current.py,sha256=GS6GvukagltY1CUW__b2CX-nBAYjOxxaatfppP5gmVg,2564
18
18
  roc/film/tasks/l0_to_l1_bia_sweep.py,sha256=VYjD_ml2M0K7WA7I4UKsmrm4cvxArYRBazmzuNs7_vs,34980
@@ -38,13 +38,13 @@ roc/film/tests/test_metadata.py,sha256=1nl5or5RPMsIgMqtvYz28qdZXVgjYw6olphMm6y8W
38
38
  roc/film/tests/tests.py,sha256=boEPC42mZYQfinYE3jyol-7O34ttU5p_Ei0a_9YUHM4,44273
39
39
  roc/film/tools/__init__.py,sha256=dkYmLgy3b_B1T3ZZ6s_rv7NyDjLF0yOJPerjLEKAFlA,303
40
40
  roc/film/tools/dataset_tasks.py,sha256=CI9UIYchLwXfcjJoD8PsaFIcNX8akAsXz4RQ4hqhJeU,2825
41
- roc/film/tools/file_helpers.py,sha256=frCBNdIp9AOYnmVbhk9VE9hkDa1l9IGM7sQuhzjqf_U,31898
41
+ roc/film/tools/file_helpers.py,sha256=x_KxZlQjarSwBmuIGq5OQIrY7ePtCUVuvik-6r3fzzo,31922
42
42
  roc/film/tools/l0.py,sha256=a5xxk3BYxtwOeZp36AoDPtF07VZpXfyKrpIYcC83u6w,46657
43
43
  roc/film/tools/metadata.py,sha256=gYFoo_VinBFoJOVIBwDfSqq0WvYTdDaS3NjEDtYREUM,12409
44
44
  roc/film/tools/skeleton.py,sha256=aTe6VWvy5Y79FuA3aKieTQ91m26PEvJ3MnzC4ZZqMvc,10765
45
45
  roc/film/tools/tools.py,sha256=b273WwDvxdowH9d8BqJX9REI3TpI7lzFsTviO23hzv4,18252
46
46
  roc/film/tools/xlsx2skt.py,sha256=sHmFLGuL1pT1N4V4Nk8i7yoHM2lveXphuvUUN28MvJs,19599
47
- roc_film-1.14.6.dist-info/LICENSE,sha256=TqI0k3vHsKpSR-Q2aQ0euTJIdbx1kOzeUL79OONRkKU,21778
48
- roc_film-1.14.6.dist-info/METADATA,sha256=jMBkDgmR_59w7SJkhr67nO6HIezZwgzMTYdSaATwsSQ,1805
49
- roc_film-1.14.6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
50
- roc_film-1.14.6.dist-info/RECORD,,
47
+ roc_film-1.15.0.dist-info/LICENSE,sha256=TqI0k3vHsKpSR-Q2aQ0euTJIdbx1kOzeUL79OONRkKU,21778
48
+ roc_film-1.15.0.dist-info/METADATA,sha256=oOAqm2h-jAW2ZWVRpHXduMMRcuVPmSCAlO-N0HTAy3Q,1805
49
+ roc_film-1.15.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
50
+ roc_film-1.15.0.dist-info/RECORD,,
{roc_film-1.14.6.dist-info → roc_film-1.15.0.dist-info}/WHEEL RENAMED
@@ -1,4 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: poetry-core 2.1.1
2
+ Generator: poetry-core 2.1.2
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any