Skip to content

Commit

Permalink
Merge pull request #230 from cta-observatory/scipy-pin
Browse files Browse the repository at this point in the history
support ctapipe 0.22
  • Loading branch information
maxnoe authored Nov 11, 2024
2 parents 3eb573d + c26c370 commit 964d98d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]
ctapipe-version: ["0.19.3", "0.20.0"]
include:
# ctapipe 0.21 requires >= 3.10
# ctapipe >=0.21 requires >= 3.10
- python-version: "3.12"
ctapipe-version: "0.21.2"
- python-version: "3.12"
ctapipe-version: "0.22.0"

defaults:
run:
Expand Down Expand Up @@ -53,7 +55,8 @@ jobs:
CTAPIPE_VERSION: ${{ matrix.ctapipe-version }}
run: |
pip install -e .
pip install pytest-cov "ctapipe==$CTAPIPE_VERSION"
# TODO: remove pypi pin when dropping support for ctapipe <0.21
pip install pytest-cov "ctapipe==$CTAPIPE_VERSION" "scipy<1.14a0"
ctapipe-info --version | grep "$CTAPIPE_VERSION"
git describe --tags
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ dependencies:
- zlib
- pip
- h5py
- scipy <1.14
- scipy
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ python_requires = >=3.9
zip_safe = False
install_requires=
astropy >=5.2,<7.0.0a0
ctapipe >=0.19.0,<0.22.0a0
ctapipe >=0.19.0,<0.23.0a0
protozfits ~=2.4
numpy >=1.20
scipy <1.14
scipy

[options.package_data]
* = resources/*
Expand Down
1 change: 1 addition & 0 deletions src/ctapipe_io_lst/anyarray_dtypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,5 @@ def parse_tib_10MHz_counter(counter):
The counter is stored using 3 uint8 values forming a 24-bit unsigned integer
"""
counter = counter.astype(np.uint32)
return counter[0] + (counter[1] << 8) + (counter[2] << 16)

0 comments on commit 964d98d

Please sign in to comment.