From 4cc942c9a6b12a2d01abadeaba61dab7c13ef95e Mon Sep 17 00:00:00 2001 From: Luigi Pertoldi Date: Wed, 24 Apr 2024 13:41:46 +0200 Subject: [PATCH 1/3] [ci] attempt to resolve random CI failures --- .github/workflows/main.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 132de5c1d..4e4b067c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,7 +14,7 @@ concurrency: env: FORCE_COLOR: 3 - TQDM_MININTERVAL: 100 + TQDM_DISABLE: yes_please jobs: build-and-test: diff --git a/pyproject.toml b/pyproject.toml index 3c47baf42..2402e2910 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,7 @@ dependencies = [ "scikit-learn", "scipy>=1.0.1", "tables", - "tqdm>=4.27", + "tqdm>=4.66", ] dynamic = [ "version", From 3af47deb25e7b325b809a050f85facc0728b3aab Mon Sep 17 00:00:00 2001 From: Luigi Pertoldi Date: Thu, 25 Apr 2024 10:22:32 +0200 Subject: [PATCH 2/3] [ci] several issues on new, default macos-14 runners, rollback --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4e4b067c6..dd36665dc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: python-version: ["3.9", "3.10", "3.11"] - os: [ubuntu-latest, macOS-latest] + os: [ubuntu-latest, macOS-13] steps: - uses: actions/checkout@v4 From 910feb56c780e77da0b0acdfd3e6fdd21523fa92 Mon Sep 17 00:00:00 2001 From: Luigi Pertoldi Date: Thu, 25 Apr 2024 10:24:01 +0200 Subject: [PATCH 3/3] pre-commit fix --- src/pygama/evt/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pygama/evt/utils.py b/src/pygama/evt/utils.py index 30d14639a..4f8391353 100644 --- a/src/pygama/evt/utils.py +++ b/src/pygama/evt/utils.py @@ -95,7 +95,7 @@ def find_parameters( if len(hit_flds) > 0: hit_ak = lh5.read_as( - f"{ch.replace('/','')}/{f.hit.group}/", + f"{ch.replace('/', '')}/{f.hit.group}/", f.hit.file, field_mask=hit_flds, idx=idx_ch, @@ -108,7 +108,7 @@ def find_parameters( if len(dsp_flds) > 0: dsp_ak = lh5.read_as( - f"{ch.replace('/','')}/{f.dsp.group}/", + f"{ch.replace('/', '')}/{f.dsp.group}/", f.dsp.file, field_mask=dsp_flds, idx=idx_ch,