From 9453748c8824456aae721ab42f81576a649c721a Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 4 Jan 2024 14:53:44 -0700 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6cc0089a..be50b7cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .sconsign.dblite config.log .sconf_temp +.coverage* +_build.* *.o *.os *.so From ac3b51efc56fdf082a067e3699eb2362acf0f318 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 4 Jan 2024 14:54:51 -0700 Subject: [PATCH 2/4] Refresh pre-commit --- .pre-commit-config.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index cda649d5..bf116a8d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,22 +1,22 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 23.12.1 hooks: - id: black - language_version: python3.10 + language_version: python3.11 - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: v0.0.288 + rev: v0.1.11 hooks: - id: ruff - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort name: isort (python) From d7040f519785f0040b9c6415849a00f93116c321 Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 4 Jan 2024 14:55:19 -0700 Subject: [PATCH 3/4] Use new QuantumContext class name --- python/lsst/cell_coadds/_cell_coadd_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lsst/cell_coadds/_cell_coadd_builder.py b/python/lsst/cell_coadds/_cell_coadd_builder.py index 95704e0e..f7e24025 100644 --- a/python/lsst/cell_coadds/_cell_coadd_builder.py +++ b/python/lsst/cell_coadds/_cell_coadd_builder.py @@ -203,7 +203,7 @@ def __init__(self, **kwargs: Any): def runQuantum( # type: ignore[override] self, - butlerQC: pipeBase.ButlerQuantumContext, + butlerQC: pipeBase.QuantumContext, inputRefs: pipeBase.InputQuantizedConnection, outputRefs: pipeBase.OutputQuantizedConnection, ) -> MultipleCellCoadd: From 606e61b609dafb16e25ddf2398113934c666362b Mon Sep 17 00:00:00 2001 From: Tim Jenness Date: Thu, 4 Jan 2024 15:03:16 -0700 Subject: [PATCH 4/4] Use mamba forge directly in action --- .github/workflows/test.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 0a60e16e..6b3cb710 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,15 +22,16 @@ jobs: - uses: conda-incubator/setup-miniconda@v2 with: python-version: ${{ matrix.pyver }} - channels: conda-forge + channels: conda-forge,default channel-priority: strict show-channel-urls: true + miniforge-variant: Mambaforge + use-mamba: true - name: Install DM stack and mypy with conda/mamba shell: bash -l {0} run: | conda config --set always_yes yes - conda install -q mamba mamba install -q stackvana=0 mamba install -q mypy