Skip to content

Commit b82ef2b

Browse files
authored
Merge branch 'main' into opposite_bug
2 parents ce15aae + 3fcdc09 commit b82ef2b

File tree

14 files changed

+405
-377
lines changed

14 files changed

+405
-377
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@2025.02.0
21+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.06.1
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@2025.02.0
28+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.06.1
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Checks if a PR makes any changes that ought to be shared via templating.
2+
# See the called workflow in the scitools/workflows repo for more details.
3+
4+
name: ci-template-check
5+
6+
on:
7+
pull_request_target:
8+
branches:
9+
- main
10+
11+
jobs:
12+
prompt-share:
13+
uses: scitools/workflows/.github/workflows/[email protected]
14+
secrets: inherit
15+
with:
16+
pr_number: ${{ github.event.pull_request.number }}

.github/workflows/ci-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969

7070
- name: "stratify tests (py${{ matrix.python-version }})"
7171
run: |
72-
python setup.py build_ext --inplace
7372
python -m pip install --no-deps --editable .
73+
python setup.py build_ext --inplace
7474
pytest ${{ matrix.cov-report }}
7575
${{ matrix.codecov }}

.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.22.0
51+
uses: pypa/cibuildwheel@v3.0.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.9.4"
41+
rev: "v0.11.13"
4242
hooks:
4343
- id: ruff
4444
types: [file, python]
@@ -56,7 +56,7 @@ repos:
5656

5757

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

7272
- repo: https://github.com/pre-commit/mirrors-mypy
73-
rev: 'v1.14.1'
73+
rev: 'v1.16.0'
7474
hooks:
7575
- id: mypy
7676
exclude: 'noxfile\.py|docs/conf\.py'
7777

7878
- repo: https://github.com/abravalheri/validate-pyproject
7979
# More exhaustive than Ruff RUF200.
80-
rev: "v0.23"
80+
rev: "v0.24.1"
8181
hooks:
8282
- id: validate-pyproject
8383

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

pyproject.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[build-system]
22
# Defined by PEP 518
33
requires = [
4-
"Cython",
5-
"oldest-supported-numpy",
6-
"setuptools>=61",
7-
"setuptools_scm[toml]>=7",
4+
"Cython<3.1.0",
5+
"numpy>=2",
6+
"setuptools>=77.0.3",
7+
"setuptools_scm[toml]>=8",
88
"wheel",
99
]
1010
# Defined by PEP 517
@@ -17,7 +17,6 @@ authors = [
1717
classifiers = [
1818
"Development Status :: 5 - Production/Stable",
1919
"Intended Audience :: Science/Research",
20-
"License :: OSI Approved :: BSD License",
2120
"Operating System :: POSIX",
2221
"Operating System :: POSIX :: Linux",
2322
"Operating System :: Unix",
@@ -44,7 +43,8 @@ keywords = [
4443
"python",
4544
"ocean-science",
4645
]
47-
license = {text = "BSD-3-Clause"}
46+
license = "BSD-3-Clause"
47+
license-files = ["LICENSE"]
4848
name = "stratify"
4949
requires-python = ">=3.10"
5050

@@ -53,7 +53,6 @@ Code = "https://github.com/SciTools-incubator/python-stratify"
5353
Issues = "https://github.com/SciTools-incubator/python-stratify/issues"
5454

5555
[tool.setuptools]
56-
license-files = ["LICENSE"]
5756
zip-safe = false
5857

5958
[tool.setuptools.dynamic]

requirements/locks/py310-linux-64.lock

Lines changed: 120 additions & 115 deletions
Large diffs are not rendered by default.

requirements/locks/py311-linux-64.lock

Lines changed: 120 additions & 116 deletions
Large diffs are not rendered by default.

requirements/locks/py312-linux-64.lock

Lines changed: 120 additions & 116 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)