From 12ea441a714e3a81b97a6d432eb0310485765320 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Thu, 25 Jul 2024 23:57:47 +0000 Subject: [PATCH 1/5] #161 Fix timezone-dependent datetime parsing --- demerge/merge/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demerge/merge/utils.py b/demerge/merge/utils.py index 2f8b824..61c02c9 100644 --- a/demerge/merge/utils.py +++ b/demerge/merge/utils.py @@ -4,7 +4,7 @@ # standard library import json import re -from datetime import datetime as dt +from datetime import datetime as dt, timezone as tz from pathlib import Path from typing import Any, Optional, Union from warnings import catch_warnings, simplefilter @@ -79,7 +79,7 @@ DATE_PARSER_ANTENNA = lambda s: dt.strptime(s, "%Y%m%d%H%M%S.%f") DATE_PARSER_CABIN = lambda s: dt.strptime(s, "%Y/%m/%d %H:%M") DATE_PARSER_MISTI = lambda s: dt.strptime(s, "%Y/%m/%d %H:%M:%S.%f") -DATE_PARSER_SKYCHOP = lambda s: dt.fromtimestamp(float(s)) +DATE_PARSER_SKYCHOP = lambda s: dt.fromtimestamp(float(s), tz.utc) DATE_PARSER_WEATHER = lambda s: dt.strptime(s, "%Y%m%d%H%M%S") PACKAGE_DATA = Path(__file__).parents[1] / "data" From bdf2d8534d70be87c886c91b533e29668e1adefa Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Fri, 26 Jul 2024 00:12:45 +0000 Subject: [PATCH 2/5] Fix timezone-dependent datetime parsing --- demerge/merge/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demerge/merge/utils.py b/demerge/merge/utils.py index 61c02c9..090bcf0 100644 --- a/demerge/merge/utils.py +++ b/demerge/merge/utils.py @@ -4,7 +4,7 @@ # standard library import json import re -from datetime import datetime as dt, timezone as tz +from datetime import datetime as dt from pathlib import Path from typing import Any, Optional, Union from warnings import catch_warnings, simplefilter @@ -79,7 +79,7 @@ DATE_PARSER_ANTENNA = lambda s: dt.strptime(s, "%Y%m%d%H%M%S.%f") DATE_PARSER_CABIN = lambda s: dt.strptime(s, "%Y/%m/%d %H:%M") DATE_PARSER_MISTI = lambda s: dt.strptime(s, "%Y/%m/%d %H:%M:%S.%f") -DATE_PARSER_SKYCHOP = lambda s: dt.fromtimestamp(float(s), tz.utc) +DATE_PARSER_SKYCHOP = lambda s: dt.utcfromtimestamp(float(s)) DATE_PARSER_WEATHER = lambda s: dt.strptime(s, "%Y%m%d%H%M%S") PACKAGE_DATA = Path(__file__).parents[1] / "data" From f7006565eb2d5caaf866530935b953d704f97ea6 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Fri, 26 Jul 2024 00:14:43 +0000 Subject: [PATCH 3/5] =?UTF-8?q?#161=20Update=20package=20version=20(2024.7?= =?UTF-8?q?.2=20=E2=86=92=202024.7.3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CITATION.cff | 2 +- README.md | 2 +- demerge/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index c51930e..9d7303b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -31,5 +31,5 @@ keywords: - spectroscopy - deshima license: MIT -version: 2024.7.2 +version: 2024.7.3 date-released: '2024-07-22' diff --git a/README.md b/README.md index 47164fd..fa4691c 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ DESHIMA merge code for observed datasets ## Installation ```shell -pip install demerge==2024.7.2 +pip install demerge==2024.7.3 ``` ## Command line interface diff --git a/demerge/__init__.py b/demerge/__init__.py index 9b4c113..61db704 100644 --- a/demerge/__init__.py +++ b/demerge/__init__.py @@ -1,5 +1,5 @@ __all__ = ["data", "demerge", "merge", "reduce"] -__version__ = "2024.7.2" +__version__ = "2024.7.3" # standard library diff --git a/pyproject.toml b/pyproject.toml index 0f86b53..1b9e56b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "demerge" -version = "2024.7.2" +version = "2024.7.3" description = "DESHIMA merge code for observed datasets" authors = [ "Tatsuya Takekoshi ", From e23318b01633bd4445ab0c3133f8fbf02b8ec252 Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Fri, 26 Jul 2024 00:14:54 +0000 Subject: [PATCH 4/5] #161 Update release date --- CITATION.cff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CITATION.cff b/CITATION.cff index 9d7303b..deeb5e7 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -32,4 +32,4 @@ keywords: - deshima license: MIT version: 2024.7.3 -date-released: '2024-07-22' +date-released: '2024-07-27' From 28c7a238104147e472cba4a431ff94369e75da2d Mon Sep 17 00:00:00 2001 From: Akio Taniguchi Date: Fri, 26 Jul 2024 00:15:19 +0000 Subject: [PATCH 5/5] #161 Update demerge command help --- README.md | 9 +++++---- demerge/__init__.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fa4691c..896d905 100644 --- a/README.md +++ b/README.md @@ -37,18 +37,19 @@ FLAGS --data_dir=DATA_DIR Type: Path Default: PosixPath('.') - Path where raw data directory is placed, + Path of directory where data packages are placed, i.e. expecting ``${data_dir}/cosmos_YYYYmmddHHMMSS``. --dems_dir=DEMS_DIR Type: Path Default: PosixPath('.') - Path where merged DEMS file will be placed, + Path of directory where merged DEMS will be placed, i.e. expecting ``${dems_dir}/dems_YYYYmmddHHMMSS.zarr.zip``. --reduced_dir=REDUCED_DIR Type: Path Default: PosixPath('.') - Path where reduced data directory will be placed, + Path of directory where reduced packages are placed, i.e. expecting ``${reduced_dir}/reduced_YYYYmmddHHMMSS``. + If not specified, a temporary directory will be used. --ddb=DDB Type: Path Default: PosixPath('/path/to/demerge/data/ddb_20240713.fits') @@ -60,7 +61,7 @@ FLAGS --overwrite=OVERWRITE Type: bool Default: False - If True, reduced data directory and merged DEMS file + If True, the reduced package and the merged DEMS file will be overwritten even if they exist. --debug=DEBUG Type: bool diff --git a/demerge/__init__.py b/demerge/__init__.py index 61db704..4ceaef7 100644 --- a/demerge/__init__.py +++ b/demerge/__init__.py @@ -77,7 +77,7 @@ def demerge( If not specified, a temporary directory will be used. ddb: Path of DDB (DESHIMA database) file. measure: Measure of the DEMS (either df/f or brightness). - overwrite: If True, reduced data directory and merged DEMS file + overwrite: If True, the reduced package and the merged DEMS file will be overwritten even if they exist. debug: If True, detailed logs for debugging will be printed. **options: Other merge options for the merge command.