From e10121e3bf9d1f1cec10f3cd11c8425662cb04d7 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Fri, 12 Jul 2024 10:07:34 +0200 Subject: [PATCH 1/7] Update requirements.txt Updating for Issue #196 --- docs/requirements.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 556e09a8..e5801897 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -6,5 +6,8 @@ pip pyyaml scikit-learn tensorflow -tf2onnx +ctaplot dl1_data_handler +numba +pydot +pyirf From 41684e28a3076fe937449809a892445bcaa2a370 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Fri, 12 Jul 2024 10:08:14 +0200 Subject: [PATCH 2/7] Update setup.py Update for Issue #196 --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index 36da24db..8af0adda 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,9 @@ def getVersionFromFile(): here = path.abspath(path.dirname(__file__)) +def getRequirements(): + return open(".docs/requirements.txt").readlines() + with open(path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() @@ -22,9 +25,11 @@ def getVersionFromFile(): url='https://github.com/ctlearn-project/ctlearn', license='BSD-3-Clause', packages=['ctlearn'], + install_requires=getRequirements(), entry_points = { 'console_scripts': ['ctlearn=ctlearn.run_model:main', 'build_irf=ctlearn.build_irf:main'], }, + dependency_links=[], zip_safe=True) From 59ecd148cab2afa6a0adb923d9354eaf4af8e39a Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Fri, 12 Jul 2024 10:25:00 +0200 Subject: [PATCH 3/7] Create pyproject.toml Creation of a first version for Issue #195 --- pyproject.toml | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..180531e0 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,53 @@ +[build-system] +requires = ["setuptools >= 65", "setuptools_scm[toml]>=6.2"] +build-backend = "setuptools.build_meta" + +[project] +name = "CTLearn" +description = "CTLearn is a package under active development to run deep learning models to analyze data from all major current and future arrays of imaging atmospheric Cherenkov telescopes (IACTs)." +readme = "README.md" +license = {text = "BSD-3-Clause"} +authors = [ + {name = "Ari Brill"}, + {name = "Bryan Kim"}, + {name = "Tjark Miener"}, + {name = "Daniel Nieto"} +] + +classifiers = [ + "License :: OSI Approved :: BSD License", + "Intended Audience :: Science/Research", + "Topic :: Scientific/Engineering :: Astronomy", + "Topic :: Scientific/Engineering :: Physics", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", +] + +requires-python = ">=3.10" +dependencies = [ + "dl1_data_handler>=0.11.1", + "astropy", + "matplotlib", + "numpy", + "pandas", + "pip", + "pyyaml", + "scikit-learn", + "ctaplot", + "numba>=0.56.2,<0.57", + "tensorflow>=2.15,<2.16", + "pydot", + "pyirf", +] + +dynamic = ["version"] + +[project.urls] +repository = "https://github.com/ctlearn-project/ctlearn" +documentation = "https://ctlearn.readthedocs.io/en/latest/" + +[project.scripts] +ctlearn="ctlearn.run_model:main" +build_irf="ctlearn.build_irf:main" From dd4925792d1b6e0fcbc14cbf9b81485f8ad984a0 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 15 Jul 2024 10:14:54 +0200 Subject: [PATCH 4/7] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 8af0adda..7e98b7cc 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ def getVersionFromFile(): here = path.abspath(path.dirname(__file__)) def getRequirements(): - return open(".docs/requirements.txt").readlines() + return open("docs/requirements.txt").readlines() with open(path.join(here, 'README.rst'), encoding='utf-8') as f: long_description = f.read() From 20de5de0d96c26af81f0399c503dda199a0cc068 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 15 Jul 2024 10:33:37 +0200 Subject: [PATCH 5/7] Update pyproject.toml --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 180531e0..8102ae45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ classifiers = [ requires-python = ">=3.10" dependencies = [ - "dl1_data_handler>=0.11.1", + "dl1_data_handler>=0.12.0", "astropy", "matplotlib", "numpy", From 6a88aafce7d03499bce7a707a7cd66d282da013e Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 15 Jul 2024 10:38:19 +0200 Subject: [PATCH 6/7] Update README.rst --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 8f4be2fa..e58c5ab5 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ necessary package channels, and install CTLearn specified version and its depend .. code-block:: bash - CTLEARN_VER=0.8.0 + CTLEARN_VER=0.9.0 wget https://raw.githubusercontent.com/ctlearn-project/ctlearn/v$CTLEARN_VER/environment.yml conda env create -n [ENVIRONMENT_NAME] -f environment.yml conda activate [ENVIRONMENT_NAME] @@ -54,10 +54,10 @@ Citing this software Please cite the corresponding version using the DOIs below if this software package is used to produce results for any publication: -.. |zendoi070| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.7908252.svg - :target: https://doi.org/10.5281/zenodo.7908252 +.. |zendoi080| image:: https://zenodo.org/badge/DOI/10.5281/zenodo.11475531.svg + :target: https://doi.org/10.5281/zenodo.11475531 -* 0.7.0 : |zendoi070| +* 0.8.0 : |zendoi080| Team ---- From d5c85e605e17cbb6e873b648984221a8343f9d95 Mon Sep 17 00:00:00 2001 From: rcervinoucm Date: Mon, 15 Jul 2024 10:39:19 +0200 Subject: [PATCH 7/7] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e58c5ab5..c5781167 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,8 @@ CTLearn: Deep Learning for IACT Event Reconstruction ==================================================== -.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3342952.svg - :target: https://doi.org/10.5281/zenodo.3342952 +.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.11475531.svg + :target: https://doi.org/10.5281/zenodo.11475531 :alt: DOI