Skip to content

Commit 4f15c67

Browse files
authored
Merge branch 'main' into numpy2
2 parents b598658 + 510faa9 commit 4f15c67

File tree

8 files changed

+10
-13
lines changed

8 files changed

+10
-13
lines changed

.github/workflows/ci-locks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ concurrency:
1818

1919
jobs:
2020
refresh_lockfiles:
21-
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2024.11.2
21+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.02.0
2222
secrets: inherit

.github/workflows/ci-manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ concurrency:
2525
jobs:
2626
manifest:
2727
name: "check-manifest"
28-
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2024.11.2
28+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.02.0

.github/workflows/ci-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
- name: "mambaforge setup (python ${{ matrix.python-version }})"
6060
uses: conda-incubator/setup-miniconda@v3
6161
with:
62-
miniforge-variant: Mambaforge
62+
miniforge-variant: Miniforge3
6363
miniforge-version: latest
64-
channels: conda-forge,defaults
64+
channels: conda-forge
6565
channel-priority: true
6666
auto-update-conda: true
6767
environment-file: "requirements/locks/py${{ matrix.python-version }}-linux-64.lock"

.github/workflows/ci-wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
fetch-depth: 0
4949

5050
- name: "build ${{ matrix.os }} (${{ matrix.arch }}) wheels"
51-
uses: pypa/cibuildwheel@v2.21.3
51+
uses: pypa/cibuildwheel@v2.22.0
5252
env:
5353
CIBW_SKIP: "cp39-* cp313-* pp* *-musllinux*"
5454
CIBW_ARCHS: ${{ matrix.arch }}

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ repos:
3838

3939

4040
- repo: https://github.com/astral-sh/ruff-pre-commit
41-
rev: "v0.8.1"
41+
rev: "v0.9.4"
4242
hooks:
4343
- id: ruff
4444
types: [file, python]
@@ -47,7 +47,7 @@ repos:
4747
types: [file, python]
4848

4949
- repo: https://github.com/codespell-project/codespell
50-
rev: "v2.3.0"
50+
rev: "v2.4.1"
5151
hooks:
5252
- id: codespell
5353
types_or: [asciidoc, python, markdown, rst]
@@ -56,7 +56,7 @@ repos:
5656

5757

5858
- repo: https://github.com/pycqa/isort
59-
rev: '5.13.2'
59+
rev: '6.0.0'
6060
hooks:
6161
- id: isort
6262
name: isort (cython)
@@ -70,7 +70,7 @@ repos:
7070
types: [file, python]
7171

7272
- repo: https://github.com/pre-commit/mirrors-mypy
73-
rev: 'v1.13.0'
73+
rev: 'v1.14.1'
7474
hooks:
7575
- id: mypy
7676
exclude: 'noxfile\.py|docs/conf\.py'
@@ -82,7 +82,7 @@ repos:
8282
- id: validate-pyproject
8383

8484
- repo: https://github.com/scientific-python/cookie
85-
rev: 2024.08.19
85+
rev: 2025.01.22
8686
hooks:
8787
- id: sp-repo-review
8888
additional_dependencies: ["repo-review[cli]"]

requirements/locks/py310-linux-64.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,3 @@ https://conda.anaconda.org/conda-forge/linux-64/libarrow-dataset-19.0.0-hcb10f89
182182
https://conda.anaconda.org/conda-forge/linux-64/libarrow-substrait-19.0.0-h08228c5_8_cpu.conda#e5dd1926e5a4b23de8ba4eacc8eb9b2d
183183
https://conda.anaconda.org/conda-forge/linux-64/pyarrow-19.0.0-py310hff52083_0.conda#4312c755fd583a80475f0f302571518a
184184
https://conda.anaconda.org/conda-forge/noarch/dask-2025.1.0-pyhd8ed1ab_0.conda#a5f91379331b61157c203ca69da6331b
185-

requirements/locks/py311-linux-64.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,3 @@ https://conda.anaconda.org/conda-forge/linux-64/libarrow-dataset-19.0.0-hcb10f89
183183
https://conda.anaconda.org/conda-forge/linux-64/libarrow-substrait-19.0.0-h08228c5_8_cpu.conda#e5dd1926e5a4b23de8ba4eacc8eb9b2d
184184
https://conda.anaconda.org/conda-forge/linux-64/pyarrow-19.0.0-py311h38be061_0.conda#7c025ec9f61c9a879bbd04fa0b6fe665
185185
https://conda.anaconda.org/conda-forge/noarch/dask-2025.1.0-pyhd8ed1ab_0.conda#a5f91379331b61157c203ca69da6331b
186-

requirements/locks/py312-linux-64.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,3 @@ https://conda.anaconda.org/conda-forge/linux-64/libarrow-dataset-19.0.0-hcb10f89
183183
https://conda.anaconda.org/conda-forge/linux-64/libarrow-substrait-19.0.0-h08228c5_8_cpu.conda#e5dd1926e5a4b23de8ba4eacc8eb9b2d
184184
https://conda.anaconda.org/conda-forge/linux-64/pyarrow-19.0.0-py312h7900ff3_0.conda#14f86e63b5c214dd9fb34e5472d4bafc
185185
https://conda.anaconda.org/conda-forge/noarch/dask-2025.1.0-pyhd8ed1ab_0.conda#a5f91379331b61157c203ca69da6331b
186-

0 commit comments

Comments
 (0)