-
Notifications
You must be signed in to change notification settings - Fork 44
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Issue hotfix #198
Merged
Merged
Issue hotfix #198
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
e10121e
Update requirements.txt
rcervinoucm 41684e2
Update setup.py
rcervinoucm 59ecd14
Create pyproject.toml
rcervinoucm dd49257
Update setup.py
rcervinoucm 20de5de
Update pyproject.toml
rcervinoucm 6a88aaf
Update README.rst
rcervinoucm d5c85e6
Update README.rst
rcervinoucm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,5 +6,8 @@ pip | |
pyyaml | ||
scikit-learn | ||
tensorflow | ||
tf2onnx | ||
ctaplot | ||
dl1_data_handler | ||
numba | ||
pydot | ||
pyirf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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.12.0", | ||
"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" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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(), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You should not duplicate information between This can lead to confusion and errors. After you introduced |
||
entry_points = { | ||
'console_scripts': ['ctlearn=ctlearn.run_model:main', | ||
'build_irf=ctlearn.build_irf:main'], | ||
}, | ||
|
||
dependency_links=[], | ||
zip_safe=True) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Requirements for building the docs should go into the
project.optional-dependencies
section ofpyproject.toml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See https://packaging.python.org/en/latest/guides/writing-pyproject-toml/#dependencies-and-requirements and e.g. https://github.com/cta-observatory/ctapipe/blob/970300e924382c3113cd36f4fa68b97fdf0a9730/pyproject.toml#L53
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have the dependencies in the setup.py and in the dependencies section in the pyproject.toml file, they should also be included in the optional-dependencies? In our case they are not optional
dependencies = [
"dl1_data_handler>=0.12.0",
"astropy",
"matplotlib",
"numpy",
"pandas",
"pip",
"pyyaml",
"scikit-learn",
"ctaplot",
"numba>=0.56.2,<0.57",
"tensorflow>=2.15,<2.16",
"pydot",
"pyirf",
]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I misunderstood then. I thought
docs/requirements.txt
are additional requirements that are needed to build the documentation (e.g. sphinx)