Skip to content

Commit 964d98d

Browse files
authored
Merge pull request #230 from cta-observatory/scipy-pin
support ctapipe 0.22
2 parents 3eb573d + c26c370 commit 964d98d

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/ci.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
python-version: ["3.9", "3.10", "3.11"]
21+
python-version: ["3.10", "3.11"]
2222
ctapipe-version: ["0.19.3", "0.20.0"]
2323
include:
24-
# ctapipe 0.21 requires >= 3.10
24+
# ctapipe >=0.21 requires >= 3.10
2525
- python-version: "3.12"
2626
ctapipe-version: "0.21.2"
27+
- python-version: "3.12"
28+
ctapipe-version: "0.22.0"
2729

2830
defaults:
2931
run:
@@ -53,7 +55,8 @@ jobs:
5355
CTAPIPE_VERSION: ${{ matrix.ctapipe-version }}
5456
run: |
5557
pip install -e .
56-
pip install pytest-cov "ctapipe==$CTAPIPE_VERSION"
58+
# TODO: remove pypi pin when dropping support for ctapipe <0.21
59+
pip install pytest-cov "ctapipe==$CTAPIPE_VERSION" "scipy<1.14a0"
5760
ctapipe-info --version | grep "$CTAPIPE_VERSION"
5861
git describe --tags
5962

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ dependencies:
1818
- zlib
1919
- pip
2020
- h5py
21-
- scipy <1.14
21+
- scipy

setup.cfg

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ python_requires = >=3.9
3131
zip_safe = False
3232
install_requires=
3333
astropy >=5.2,<7.0.0a0
34-
ctapipe >=0.19.0,<0.22.0a0
34+
ctapipe >=0.19.0,<0.23.0a0
3535
protozfits ~=2.4
3636
numpy >=1.20
37-
scipy <1.14
37+
scipy
3838

3939
[options.package_data]
4040
* = resources/*

src/ctapipe_io_lst/anyarray_dtypes.py

+1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ def parse_tib_10MHz_counter(counter):
7070
7171
The counter is stored using 3 uint8 values forming a 24-bit unsigned integer
7272
"""
73+
counter = counter.astype(np.uint32)
7374
return counter[0] + (counter[1] << 8) + (counter[2] << 16)

0 commit comments

Comments
 (0)