From 7169d8423d5b648f40a54566431b133ce2c3f55c Mon Sep 17 00:00:00 2001 From: TjarkMiener Date: Mon, 2 Jun 2025 13:57:25 +0200 Subject: [PATCH 01/16] added pytables to env file --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 39356256..bbfcf6bb 100644 --- a/environment.yml +++ b/environment.yml @@ -10,6 +10,7 @@ dependencies: - numpy - pandas - pip + - pytables - pyyaml - scikit-learn - ctapipe From c83c298bc5bcb1467391152f7bf846fc58df7699 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 14:38:09 +0200 Subject: [PATCH 02/16] Update environment.yml with blosc2 --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index bbfcf6bb..2f863d39 100644 --- a/environment.yml +++ b/environment.yml @@ -9,6 +9,7 @@ dependencies: - setuptools - numpy - pandas + - blosc2 - pip - pytables - pyyaml From 907e9d8ea3569cae95954ea8ca4bfb71c5c3ec98 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 15:42:50 +0200 Subject: [PATCH 03/16] Update environment.yml --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index 2f863d39..bbfcf6bb 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,6 @@ dependencies: - setuptools - numpy - pandas - - blosc2 - pip - pytables - pyyaml From b63baddb6c64596822c396ea37a8874c77eb3974 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:28:05 +0200 Subject: [PATCH 04/16] Fake version update to try to solve CI probleml --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index bbfcf6bb..49f024c5 100644 --- a/environment.yml +++ b/environment.yml @@ -19,3 +19,5 @@ dependencies: - tensorflow>=2.14,<2.15 - dl1_data_handler>=0.14.5,<0.15 - pydot + - tables==999.999.999 # fake version + From e3275bd4a3f2733c1cd32bff1bc607e50d8a67a1 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:32:09 +0200 Subject: [PATCH 05/16] Update environment.yml --- environment.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/environment.yml b/environment.yml index 49f024c5..bbfcf6bb 100644 --- a/environment.yml +++ b/environment.yml @@ -19,5 +19,3 @@ dependencies: - tensorflow>=2.14,<2.15 - dl1_data_handler>=0.14.5,<0.15 - pydot - - tables==999.999.999 # fake version - From 36adc23e194f871cae621a096950f4a7b84813fb Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:35:48 +0200 Subject: [PATCH 06/16] Include tables --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index bbfcf6bb..f629f11a 100644 --- a/environment.yml +++ b/environment.yml @@ -12,6 +12,7 @@ dependencies: - pip - pytables - pyyaml + - tables~=3.4 - scikit-learn - ctapipe - pip: From b20f1b3390f0f4241ff6b3c7b645f564cedadc28 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:40:45 +0200 Subject: [PATCH 07/16] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index c2c8c558..c164a534 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -20,6 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.pyv }} run: | # Install Miniconda @@ -33,10 +34,16 @@ jobs: mamba install -y python=${{ matrix.pyv }} - name: Add MKL_THREADING_LAYER variable run: echo "MKL_THREADING_LAYER=GNU" >> $GITHUB_ENV + - name: Install system dependencies + run: sudo apt-get update && sudo apt-get install -y libblosc2 - name: Install dependencies with Mamba run: | source $HOME/miniconda/bin/activate mamba env update --file environment.yml --name base + + - name: Fix missing libblosc2 + run: | + $HOME/miniconda/bin/mamba install -y blosc2 - name: Lint with flake8 run: | source $HOME/miniconda/bin/activate From d2d19093459bcee0225259dc59713f94771ff6bf Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:45:05 +0200 Subject: [PATCH 08/16] Update python-package-conda.yml --- .github/workflows/python-package-conda.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index c164a534..ab91343f 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -34,8 +34,6 @@ jobs: mamba install -y python=${{ matrix.pyv }} - name: Add MKL_THREADING_LAYER variable run: echo "MKL_THREADING_LAYER=GNU" >> $GITHUB_ENV - - name: Install system dependencies - run: sudo apt-get update && sudo apt-get install -y libblosc2 - name: Install dependencies with Mamba run: | source $HOME/miniconda/bin/activate From 2ecd98c1423c0418db6de3e65438e97ed27d6974 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:45:18 +0200 Subject: [PATCH 09/16] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index f629f11a..ce538d94 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,7 @@ dependencies: - pip - pytables - pyyaml - - tables~=3.4 + - tables=3.8.0 - scikit-learn - ctapipe - pip: From 0d4c9e173296000943296810b75e0af688f4121b Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 16:47:21 +0200 Subject: [PATCH 10/16] Revert changes --- environment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment.yml b/environment.yml index ce538d94..bbfcf6bb 100644 --- a/environment.yml +++ b/environment.yml @@ -12,7 +12,6 @@ dependencies: - pip - pytables - pyyaml - - tables=3.8.0 - scikit-learn - ctapipe - pip: From c019eac5417147167781f76d053ffd89ab3336dd Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 2 Jun 2025 17:02:35 +0200 Subject: [PATCH 11/16] Revert changes --- .github/workflows/python-package-conda.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index ab91343f..3d5034e9 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -38,10 +38,6 @@ jobs: run: | source $HOME/miniconda/bin/activate mamba env update --file environment.yml --name base - - - name: Fix missing libblosc2 - run: | - $HOME/miniconda/bin/mamba install -y blosc2 - name: Lint with flake8 run: | source $HOME/miniconda/bin/activate From d37cf6bf695692225cf4de1cbf15b81ff7402727 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Tue, 3 Jun 2025 18:21:00 +0200 Subject: [PATCH 12/16] Test to revert changes --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index bbfcf6bb..d910a656 100644 --- a/environment.yml +++ b/environment.yml @@ -17,5 +17,5 @@ dependencies: - pip: - numba - tensorflow>=2.14,<2.15 - - dl1_data_handler>=0.14.5,<0.15 + - dl1_data_handler>=0.14.3,<0.15 - pydot From c4245f782b8de6f08e5ede1a9ae9a8415905abe1 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Tue, 3 Jun 2025 18:25:12 +0200 Subject: [PATCH 13/16] Revert changes --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index d910a656..bbfcf6bb 100644 --- a/environment.yml +++ b/environment.yml @@ -17,5 +17,5 @@ dependencies: - pip: - numba - tensorflow>=2.14,<2.15 - - dl1_data_handler>=0.14.3,<0.15 + - dl1_data_handler>=0.14.5,<0.15 - pydot From f9dc349ddfa5321614daeff740e746a1c9f8a9bf Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Thu, 5 Jun 2025 13:34:15 +0200 Subject: [PATCH 14/16] Test including blosc2 and tables at once --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index bbfcf6bb..607ad8b6 100644 --- a/environment.yml +++ b/environment.yml @@ -11,6 +11,8 @@ dependencies: - pandas - pip - pytables + - blosc2 + - tables - pyyaml - scikit-learn - ctapipe From 4ceaba7d4cdcaa2f780da96f250877568de858b1 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Thu, 5 Jun 2025 13:37:28 +0200 Subject: [PATCH 15/16] Update environment.yml --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 607ad8b6..20a49207 100644 --- a/environment.yml +++ b/environment.yml @@ -11,8 +11,8 @@ dependencies: - pandas - pip - pytables - - blosc2 - tables + - c-blosc2=2.13 - pyyaml - scikit-learn - ctapipe From c3cbf167e502d1f22241f013f223b1a819e320e8 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Thu, 5 Jun 2025 13:42:12 +0200 Subject: [PATCH 16/16] Remove space --- .github/workflows/python-package-conda.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-package-conda.yml b/.github/workflows/python-package-conda.yml index 3d5034e9..c2c8c558 100644 --- a/.github/workflows/python-package-conda.yml +++ b/.github/workflows/python-package-conda.yml @@ -20,7 +20,6 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.pyv }} run: | # Install Miniconda