Skip to content

Commit

Permalink
Merge pull request #56 from jlenain/ini2toml
Browse files Browse the repository at this point in the history
Pure `pyproject.toml` project specifications
  • Loading branch information
jlenain authored Apr 18, 2023
2 parents a99fa24 + 801b54a commit 3c67334
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 68 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
run: |
pytest --cov=nectarchain --cov-report=xml
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v3
2 changes: 1 addition & 1 deletion .github/workflows/deploy-ghcr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
deffiles: [[singularity/Singularity, latest]]
deffiles: [[Singularity, latest]]

env:
container: nectarchain
Expand Down
5 changes: 1 addition & 4 deletions singularity/Singularity → Singularity
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
#
# Built from mambaforge, with special conda environment containing nectarchain
#
# Jean-Philippe Lenain <jlenain@in2p3.fr>
# Time-stamp: "2023-04-08 00:20:24 jlenain"
#
# Typically, build this image with:
# `sudo apptainer build nectarchain.sif singularity/Singularity`
# `sudo apptainer build nectarchain.sif Singularity`
#
# Then, typically run an instance of this image with:
# `apptainer shell nectarchain.sif`
Expand Down
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ channels:
dependencies:
- python=3.8 # nail the python version, so conda does not try upgrading / downgrading
- ctapipe=0.12
- ctapipe-io-nectarcam
- numpy=1.22 # higher versions >=1.23 don't work due to astropy4 dependency in ctapipe0.12
- jupyterlab
- protozfits=2.0
Expand All @@ -13,6 +14,5 @@ dependencies:
- pip
- pandas
- pip:
- ctapipe-io-nectarcam
- mechanize
- browser-cookie3
47 changes: 46 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
[build-system]
requires = ["setuptools >= 64.0.3", "setuptools_scm[toml]>=3.4"]
requires = ["setuptools >= 65", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"

[project]
name = "nectarchain"
description = "Analysis chain for the CTA MSTN NectarCAM prototype"
authors = [{name = "NectarCAM collaboration"}]
license = {text = "BSD-3-Clause"}
classifiers = [
"Development Status :: 3 - Alpha",
"License :: OSI Approved :: BSD License",
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Astronomy",
"Topic :: Scientific/Engineering :: Physics",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.8",
]
requires-python = "~=3.8"
dependencies = [
"astropy~=4.2",
"ctapipe~=0.12",
"ctapipe-io-nectarcam",
"numpy~=1.22",
"protozfits~=2.0",
"tables>=3.7",
]
dynamic = ["version"]

[project.readme]
file = "README.md"
content-type = "text/markdown; charset=UTF-8"

[project.urls]
"Bug Tracker" = "https://github.com/cta-observatory/nectarchain/issues"
"Source Code" = "https://github.com/cta-observatory/nectarchain"

[project.optional-dependencies]
tests = ["pytest"]
dev = ["setuptools_scm"]
all = [
"pytest",
"setuptools_scm",
]

[tool.setuptools.packages.find]
where = ["src"]
exclude = ["nectarchain._dev_version"]

[tool.setuptools_scm]
write_to = "src/nectarchain/_version.py"
58 changes: 0 additions & 58 deletions setup.cfg

This file was deleted.

2 changes: 0 additions & 2 deletions setup.py

This file was deleted.

0 comments on commit 3c67334

Please sign in to comment.