From 4e189583143e6fb828164f32aefd308d8013a02f Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 17 Dec 2024 15:58:37 +0100 Subject: [PATCH 1/8] Use better compression for R0G and R0V files --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 7a00deba9b..2f66a7f31a 100644 --- a/environment.yml +++ b/environment.yml @@ -17,7 +17,7 @@ dependencies: - iminuit>=2 - joblib~=1.2.0 - toml - - protozfits=2.5 + - protozfits=2.6 - pyparsing - scipy~=1.11.4 - scikit-learn=1.2 From 57fd700f7622d6f067f1925012ee1857050c93b2 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 17 Dec 2024 16:01:01 +0100 Subject: [PATCH 2/8] Increase protozfits version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f7edf51fb1..da93e557ec 100644 --- a/setup.py +++ b/setup.py @@ -60,7 +60,7 @@ def find_scripts(script_dir, prefix, suffix='.py'): 'scikit-learn~=1.2', 'tables', 'toml', - 'protozfits>=2.5,<3', + 'protozfits>=2.6.1,<3', 'pymongo', 'pyparsing', 'setuptools_scm', From af7ba3ec4bec86f77f583c75cde56e89c326840b Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 17 Dec 2024 16:02:26 +0100 Subject: [PATCH 3/8] Update lstchain_r0_to_r0g.py Changed compression algo --- lstchain/scripts/lstchain_r0_to_r0g.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lstchain/scripts/lstchain_r0_to_r0g.py b/lstchain/scripts/lstchain_r0_to_r0g.py index c4dc721fa3..2c4616da86 100644 --- a/lstchain/scripts/lstchain_r0_to_r0g.py +++ b/lstchain/scripts/lstchain_r0_to_r0g.py @@ -118,7 +118,7 @@ def main(): n_tiles=n_tiles, rows_per_tile=rows_per_tile, compression_block_size_kb=64*1024, - defaul_compression="zstd9")) + defaul_compression="lst-r1v1-uncalibrated")) stream.open(str(name)) stream.move_to_new_table("DataStream") From 54df826155b4f288236825c693d91efdae5a3a44 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Tue, 17 Dec 2024 16:03:04 +0100 Subject: [PATCH 4/8] Changed compression algo --- lstchain/scripts/lstchain_r0g_to_r0v.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lstchain/scripts/lstchain_r0g_to_r0v.py b/lstchain/scripts/lstchain_r0g_to_r0v.py index e2bb4368ad..48697603cc 100644 --- a/lstchain/scripts/lstchain_r0g_to_r0v.py +++ b/lstchain/scripts/lstchain_r0g_to_r0v.py @@ -118,7 +118,7 @@ def main(): n_tiles=n_tiles, rows_per_tile=rows_per_tile, compression_block_size_kb=64*1024, - defaul_compression="zstd9")) + defaul_compression="lst-r1v1-uncalibrated")) stream.open(str(name)) stream.move_to_new_table("DataStream") From c93baab40c96915a4f8a255cf31565a29602f6e4 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Wed, 18 Dec 2024 09:36:59 +0100 Subject: [PATCH 5/8] Update setup.cfg Drop python 3.9 support --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 7ad5dd74e2..49d5325b8d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,4 +10,4 @@ long_description_content_type = text/markdown github_project = cta-observatory/cta-lstchain [options] -python_requires = >=3.9 +python_requires = >=3.10 From 781a7b4106c1d05db273c88da8c74e763da64a47 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Wed, 18 Dec 2024 09:39:02 +0100 Subject: [PATCH 6/8] Update ci.yml Do not test on python 3.9 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a29e9fe3de..91b163eb9a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: strategy: matrix: - python-version: ["3.9", "3.10", "3.11"] + python-version: ["3.10", "3.11"] ctapipe-version: ["v0.19.2"] steps: From 18f7ebeef9d27d045518e46dc3b4dba520445705 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Wed, 18 Dec 2024 09:52:16 +0100 Subject: [PATCH 7/8] Update ci.yml 3.9 => 3.10 in docs --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91b163eb9a..6ac0a957ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.10 - name: Install doc dependencies run: | From fbcb44c0db1ed6b820b366552094328198519dd4 Mon Sep 17 00:00:00 2001 From: Abelardo Moralejo Date: Wed, 18 Dec 2024 10:24:36 +0100 Subject: [PATCH 8/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ac0a957ba..144aeec422 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Install doc dependencies run: |