From 365a55fea44d17a814e7bdfb704b4808cb4940b8 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 2 Sep 2024 17:30:24 +0200 Subject: [PATCH 1/5] Updare requirements for conda-forge package. --- environment.yml | 2 +- setup.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment.yml b/environment.yml index 6f6354f1..ed9714ff 100644 --- a/environment.yml +++ b/environment.yml @@ -27,7 +27,7 @@ dependencies: - pre-commit - toml - tomli - - protobuf=3.20 + - protozfits=2.5 - pydata-sphinx-theme - pyparsing - psutil diff --git a/setup.cfg b/setup.cfg index ecd18a55..98486ed1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -43,10 +43,10 @@ install_requires = h5py iminuit >=2 joblib ~=1.2.0 - matplotlib ~=3.0 + matplotlib ~=3.7 numba numpy - protobuf ~=3.20.0 + protozfits >=2.5,<3 scipy >=1.8, <1.12 scikit-learn ~=1.2 tables From 54499b1fcaae3f893f7021961efb905ded8a2392 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Mon, 2 Sep 2024 18:07:31 +0200 Subject: [PATCH 2/5] Show conda package status. --- README.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d3c41e7d..cf703994 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ magic-cta-pipe .. container:: - |Actions Status| |PyPI Status| |Documentation Status| |Pre-Commit| |isort Status| |black| + |Actions Status| |PyPI Status| |Conda Status| |Documentation Status| |Pre-Commit| |isort Status| |black| Repository for the analysis of MAGIC and MAGIC+LST1 data, based on `ctapipe `_. @@ -65,6 +65,10 @@ Developers should follow the development install instructions found in the :target: https://pypi.org/project/magic-cta-pipe :alt: magic-cta-pipe PyPI Status +.. |Conda Status| image:: https://anaconda.org/conda-forge/magic-cta-pipe/badges/version.svg + :target: https://anaconda.org/conda-forge/magic-cta-pipe + :alt: magic-cta-pipe Conda Status + .. |Documentation Status| image:: https://readthedocs.org/projects/magic-cta-pipe/badge/?version=latest&style=flat :target: https://magic-cta-pipe.readthedocs.io/en/latest/ :alt: magic-cta-pipe documentation Status From 357756da99702879a22c1e49bb168153eea866ff Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Tue, 3 Sep 2024 12:12:04 +0200 Subject: [PATCH 3/5] Constrain on the lstchain version. --- environment.yml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index ed9714ff..7ea00d7c 100644 --- a/environment.yml +++ b/environment.yml @@ -48,4 +48,4 @@ dependencies: - pymongo - pyirf~=0.10.0 - ctapipe-io-magic~=0.5.4 - - lstchain~=0.10.5 + - lstchain>=0.10.5,<0.10.12 diff --git a/setup.cfg b/setup.cfg index 98486ed1..3e889c09 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,7 +29,7 @@ python_requires = >=3.9 zip_safe = False install_requires = ctapipe ~=0.19.2 - lstchain ~=0.10.5 + lstchain >=0.10.5, <0.10.12 ctaplot ~=0.6.4 ctapipe_io_magic ~=0.5.4 gammapy ~=1.1 From 7c0dffb0b6e3fda84719c0cae53104ebb6b14878 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Tue, 3 Sep 2024 15:55:08 +0200 Subject: [PATCH 4/5] Update to v0.5.1 --- docs/_static/switcher.json | 5 +++++ docs/index.rst | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/_static/switcher.json b/docs/_static/switcher.json index a973b515..c6847754 100644 --- a/docs/_static/switcher.json +++ b/docs/_static/switcher.json @@ -9,6 +9,11 @@ "version": "stable", "url": "https://magic-cta-pipe.readthedocs.io/en/stable/" }, + { + "name": "v0.5.1", + "version": "v0.5.1", + "url": "https://magic-cta-pipe.readthedocs.io/en/v0.5.1/" + }, { "name": "v0.5.0", "version": "v0.5.0", diff --git a/docs/index.rst b/docs/index.rst index 557a281c..4e632172 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -27,14 +27,14 @@ Check out the :doc:`user-guide/index` section for the analysis steps, including .. note:: - At the moment of the release v0.5.0 of *magic-cta-pipe*, some LST-1 data are processed with *cta-lstchain* v0.9.x, - while the most recent ones are processed with v0.10.x. v0.5.0 of *magic-cta-pipe* allows to read in LST data files + At the moment of the release v0.5.1 of *magic-cta-pipe*, some LST-1 data are processed with *cta-lstchain* v0.9.x, + while the most recent ones are processed with v0.10.x. v0.5.1 of *magic-cta-pipe* allows to read in LST data files created with both v0.9.x and v0.10.x, so that you do not need to use different versions of *magic-cta-pipe* to process LST data. Note that there are quite a lot of differences between v0.3.1 and v0.4.x, like for the telescope combinations definition, the way IRF are created (due to different *pyirf* versions) and so on. Therefore it may not be straightforward to stack the - data at high level. We recommend to use only v0.5.0 for the processing, so that there will be no mismatches during the analysis. + data at high level. We recommend to use only v0.5.1 for the processing, so that there will be no mismatches during the analysis. Contents -------- From c98021552f4d399d787ba622c679e775e1aad9a0 Mon Sep 17 00:00:00 2001 From: Alessio Berti Date: Tue, 3 Sep 2024 15:55:24 +0200 Subject: [PATCH 5/5] Update README. --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index cf703994..9715e3b5 100644 --- a/README.rst +++ b/README.rst @@ -11,27 +11,27 @@ Repository for the analysis of MAGIC and MAGIC+LST1 data, based on `ctapipe `_ for more details on how to run the analysis. -v0.5.0 is based on *ctapipe* v0.19.x and *cta-lstchain* v0.10.x. +v0.5.1 is based on *ctapipe* v0.19.x and *cta-lstchain* v0.10.x (with 5<=x<12). **NOTE ON OLD RELEASES** v0.3.1 of *magic-cta-pipe* was the last release before the cleanup of old files. Also, it was the last one supporting ctapipe v0.12. -In order to exploit fully the new functionalities provided by *ctapipe*, use always the latest stable release of *magic-cta-pipe* (currently v0.5.0). -v0.5.0 contains backward incompatible changes with respect to v0.3.1. Therefore, you cannot mix analyses performed with the two releases. +In order to exploit fully the new functionalities provided by *ctapipe*, use always the latest stable release of *magic-cta-pipe* (currently v0.5.1). +v0.5.1 contains backward incompatible changes with respect to v0.3.1. Therefore, you cannot mix analyses performed with the two releases. **COMPATIBILITY OF MAGIC-CTA-PIPE WITH LSTCHAIN DATA** -At the moment of the release v0.5.0 of *magic-cta-pipe*, some LST-1 data are processed with *cta-lstchain* v0.9.x, -while the most recent ones are processed with v0.10.x. v0.5.0 of *magic-cta-pipe* allows to read in LST data files +At the moment of the release v0.5.1 of *magic-cta-pipe*, some LST-1 data are processed with *cta-lstchain* v0.9.x, +while the most recent ones are processed with v0.10.x. v0.5.1 of *magic-cta-pipe* allows to read in LST data files created with both v0.9.x and v0.10.x, so that you do not need to use different versions of *magic-cta-pipe* to process LST data. Note that there are quite a lot of differences between v0.3.1 and v0.4.x, like for the telescope combinations definition, the way IRF are created (due to different *pyirf* versions) and so on. Therefore it may not be straightforward to stack the -data at high level. We recommend to use only v0.5.0 for the processing, so that there will be no mismatches during the analysis. +data at high level. We recommend to use only v0.5.1 for the processing, so that there will be no mismatches during the analysis. Installation for users ----------------------