From 928819f78b287f49a53028eecc09fd828beb6c37 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 28 Aug 2023 18:22:18 +0200 Subject: [PATCH 1/5] Update python version and other dependencies. --- environment.yml | 11 ++++------- setup.cfg | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/environment.yml b/environment.yml index c7ac88f..5936b3e 100644 --- a/environment.yml +++ b/environment.yml @@ -4,14 +4,14 @@ channels: - default dependencies: - astropy=5 - - python=3.10 + - python=3.11 - ctapipe=0.19 - eventio - corsikaio - zeromq - ipython - - numba - - numpy=1.22 + - numba>=0.56 + - numpy>=1.22 - numpydoc - pytest - pyyaml @@ -19,7 +19,4 @@ dependencies: - zlib - pip - h5py - - pip: - - pytest_runner - - uproot~=5.0 - + - uproot=5 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 78a430c..93bc3f0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,8 @@ python_requires = >=3.8 zip_safe = False install_requires= astropy~=5.0 - ctapipe>=0.17.0,<=0.19 - numpy>=1.20 + ctapipe~=0.19.0 + numpy>=1.22 uproot~=5.0 [options.package_data] From fc3b46045cb20dabed8ed5db30848a0463f5a0db Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 28 Aug 2023 18:22:27 +0200 Subject: [PATCH 2/5] Fix typo. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3e51e3f..38d72fe 100644 --- a/README.md +++ b/README.md @@ -122,4 +122,4 @@ Some general information about the simulated data, useful for IRF calculation, a - v0.5.0: release compatible with ctapipe 0.17. Also, the equivalent focal length is set to the correct value used in MAGIC simulations (i.e. 16.97 meters) - v0.5.1: release compatible with ctapipe 0.19 -- v0.5.2: introduce capbility of reading data taken with the Hardware Stereo Trigger (HaST) between MAGIC and LST-1. Also, fixed bug when getting the time difference between events for mono data +- v0.5.2: introduce capability of reading data taken with the Hardware Stereo Trigger (HaST) between MAGIC and LST-1. Also, fixed bug when getting the time difference between events for mono data From 0623274c7625565079d15385f4f7b174fd4edfde Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 28 Aug 2023 18:24:12 +0200 Subject: [PATCH 3/5] Fix typo in url for uproot. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 38d72fe..ba8bc7f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## *ctapipe* MAGIC event source -EventSource plugin for *ctapipe*, needed to read the calibrated data of the MAGIC telescope system. It requires the [*ctapipe*](https://github.com/cta-observatory/ctapipe) (v0.19.0) and [*uproot*](https://github.com/scikit-hep/uproot4) (>=5) packages to run. +EventSource plugin for *ctapipe*, needed to read the calibrated data of the MAGIC telescope system. It requires [*ctapipe*](https://github.com/cta-observatory/ctapipe) (v0.19.x) and [*uproot*](https://github.com/scikit-hep/uproot5) (>=5) packages to run. #### Installation From 8e3f2687b28b0e96c10454d4e7ac2287efc1cba9 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 28 Aug 2023 18:26:03 +0200 Subject: [PATCH 4/5] Add description for new release. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ba8bc7f..8b1d4f8 100644 --- a/README.md +++ b/README.md @@ -123,3 +123,4 @@ Some general information about the simulated data, useful for IRF calculation, a correct value used in MAGIC simulations (i.e. 16.97 meters) - v0.5.1: release compatible with ctapipe 0.19 - v0.5.2: introduce capability of reading data taken with the Hardware Stereo Trigger (HaST) between MAGIC and LST-1. Also, fixed bug when getting the time difference between events for mono data +- v0.5.3: support for python 3.11 From 25d3c56ecaddec9c8105fc2c14b0758ccbda64b5 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 28 Aug 2023 18:26:33 +0200 Subject: [PATCH 5/5] Add python 3.11 for tests and update ctapipe version. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5446de..c2447f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] - ctapipe-version: ["v0.19.0",] + python-version: ["3.8", "3.9", "3.10", "3.11"] + ctapipe-version: ["v0.19.2",] defaults: run: