Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.9]
python-version: [3.13]

steps:
- name: Checkout github repo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: notebooks

on:
schedule:
- cron: "0 12 * * MON" # run job every Monday at 7.00a EST
- cron: "0 0 1 * *" # run job every Monday at 7.00a EST
push:
branches:
- main
Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]

steps:
- name: Checkout github repo
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12", "3.13"]

steps:
- name: Checkout github repo
Expand Down
24 changes: 9 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,14 @@ Issues marked with `contributions welcome` or `good first issue` are particularl
If you use this software for your research, please cite using the following bibtex entry:

```
@ARTICLE{mendoza2024btk,
author = {{Mendoza}, Ismael and {Torchylo}, Andrii and {Sainrat}, Thomas and {Guinot}, Axel and {Boucaud}, Alexandre and {Paillassa}, Maxime and {Avestruz}, Camille and {Adari}, Prakruth and {Aubourg}, Eric and {Biswas}, Biswajit and {Buchanan}, James and {Burchat}, Patricia and {Doux}, Cyrille and {Joseph}, Remy and {Kamath}, Sowmya and {Malz}, Alex I. and {Merz}, Grant and {Miyatake}, Hironao and {Roucelle}, C{\'e}cile and {Zhang}, Tianqing and {the LSST Dark Energy Science Collaboration}},
title = "{The Blending ToolKit: A simulation framework for evaluation of galaxy detection and deblending}",
journal = {arXiv e-prints},
keywords = {Astrophysics - Instrumentation and Methods for Astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics},
year = 2024,
month = sep,
eid = {arXiv:2409.06986},
pages = {arXiv:2409.06986},
doi = {10.48550/arXiv.2409.06986},
archivePrefix = {arXiv},
eprint = {2409.06986},
primaryClass = {astro-ph.IM},
adsurl = {https://ui.adsabs.harvard.edu/abs/2024arXiv240906986M},
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
@article{article,
author = {Mendoza, Ismael and Torchylo, Andrii and Sainrat, Thomas and Guinot, Axel and Boucaud, Alexandre and Paillasa, Maxime and Avestruz, Camille and Adari, Prakruth and Aubourg, Eric and Biswas, Biswajit and Buchanan, James and Burchat, Patricia and Doux, Cyrille and Joseph, Remy and Kamath, Sowmya and Malz, Alex and Merz, Grant and Miyatake, Hironao and Roucelle, Cécile and Zhang, Tianqing},
year = {2025},
month = {02},
pages = {},
title = {The Blending ToolKit: A simulation framework for evaluation of galaxy detection and deblending},
volume = {8},
journal = {The Open Journal of Astrophysics},
doi = {10.33232/001c.129699}
}
```
6 changes: 3 additions & 3 deletions docs/source/install.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Installation
===============

*BlendingToolKit* (``btk``) uses `GalSim <https://github.com/GalSim-developers/GalSim>`_ to simulate galaxy images. The python version required for ``btk`` is ``python 3.9`` or higher. We currently do not support the latest python version ``python 3.13``.
*BlendingToolKit* (``btk``) uses `GalSim <https://github.com/GalSim-developers/GalSim>`_ to simulate galaxy images. The python version required for ``btk`` is ``python 3.10`` or higher.
The required packages for ``btk`` are:

* astropy
Expand Down Expand Up @@ -33,8 +33,8 @@ Another option is to create a ``conda`` environment and install GalSim through `

.. code-block::

conda create -n py39 python=3.9 anaconda
conda activate py39
conda create -n py313 python=3.13 anaconda
conda activate py313
conda install -c conda-forge galsim

For more details see `this link <https://galsim-developers.github.io/GalSim/_build/html/install_conda.html>`_.
Expand Down
33 changes: 14 additions & 19 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ authors = [
]
maintainers = [{ name = "Ismael Mendoza", email = "[email protected]" }]
classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
]
Expand All @@ -27,7 +27,7 @@ license = { file = "LICENSE" }
name = "blending_toolkit"
readme = "README.md"
version = "1.0.8"
requires-python = ">=3.9,<3.13"
requires-python = ">=3.10,<3.14"
dependencies = [
"galsim>=2.4.9",
"sep>=1.4.0",
Expand All @@ -39,7 +39,7 @@ dependencies = [
"h5py>=3.12.1",
"tqdm>=4.67.1",
"astropy>=5.1.0,<7.0.0",
"matplotlib>=3.7.0", # scarlet needs this
"matplotlib>=3.7.0", # scarlet needs this
]

[project.optional-dependencies]
Expand All @@ -55,21 +55,16 @@ dev = [
"sphinx>=7.4.7",
"sphinx-rtd-theme>=1.2.1",
]
scarlet = [
"peigen>=0.0.9",
"autograd>=1.5.0",
"proxmin>=0.6.12",
"pybind11>=2.10.3",
]
scarlet = ["peigen>=0.0.9", "autograd>=1.5.0", "proxmin>=0.6.12", "pybind11>=2.10.3"]

[project.urls]
Homepage = "https://lsstdesc.org/BlendingToolKit/index.html"
Repository = "https://github.com/LSSTDESC/BlendingToolKit"
Homepage = "https://lsstdesc.org/BlendingToolKit/index.html"
Repository = "https://github.com/LSSTDESC/BlendingToolKit"
"Bug Tracker" = "https://github.com/LSSTDESC/BlendingToolKit/issues"


[build-system]
requires = ["setuptools>=61.0"]
requires = ["setuptools>=61.0"]
build-backend = "setuptools.build_meta"

[tool.setuptools]
Expand Down Expand Up @@ -107,7 +102,7 @@ exclude = [
]

# Copying over black configuration
line-length = 100
line-length = 100
indent-width = 4

# Assume Python 3.12
Expand All @@ -129,10 +124,10 @@ select = ["E", "F", "W", "I", "D", "PL", "RUF", "SIM", "RET"]
# PLR2004: Magic value comparison is OK most of the time.
# PLR0913: "Too many arguments in function definition", we should fix some of these eventually.
# SIM118: Too many places where we use `k in table.keys()`, and table is not a dict.
ignore = ["PLR2004", "PLR0913", "SIM118"]
ignore = ["PLR2004", "PLR0913", "SIM118", "PLC0415"]

# Allow fix for all enabled rules (when `--fix`) is provided.
fixable = ["ALL"]
fixable = ["ALL"]
unfixable = []

# Allow unused variables when underscore-prefixed.
Expand Down Expand Up @@ -167,14 +162,14 @@ docstring-code-line-length = "dynamic"


[tool.ruff.lint.per-file-ignores]
"__init__.py" = ["E402", "I", "F"]
"__init__.py" = ["E402", "I", "F"]
"**/{tests,docs,tools}/*" = ["E402", "D", "PLR0915"]
"**/*.ipynb" = ["I"]
"**/*.ipynb" = ["I"]

[tool.ruff.lint.pydocstyle]
convention = "google"

[tool.pytest.ini_options]
addopts = "-ra"
addopts = "-ra"
minversion = "6.0"
testpaths = ["tests"]
testpaths = ["tests"]