Skip to content

Commit 8c2ce04

Browse files
authored
Merge branch 'main' into auto-update-lockfiles
2 parents 508f370 + b57e45d commit 8c2ce04

File tree

7 files changed

+13
-14
lines changed

7 files changed

+13
-14
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.04.4
21+
uses: scitools/workflows/.github/workflows/refresh-lockfiles.yml@2025.05.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.04.4
28+
uses: scitools/workflows/.github/workflows/ci-manifest.yml@2025.05.1

.github/workflows/ci-template-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
prompt-share:
13-
uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.04.4
13+
uses: scitools/workflows/.github/workflows/ci-template-check.yml@2025.05.1
1414
secrets: inherit
1515
with:
1616
pr_number: ${{ github.event.pull_request.number }}

pyproject.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
requires = [
44
"Cython",
55
"numpy>=2",
6-
"setuptools>=61",
7-
"setuptools_scm[toml]>=7",
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/py310.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
- python=3.10
88

99
# Setup dependencies.
10-
- setuptools
11-
- setuptools-scm
10+
- setuptools>=77.0.3
11+
- setuptools-scm>=8
1212

1313
# Core dependencies.
1414
- numpy>=2

requirements/py311.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
- python=3.11
88

99
# Setup dependencies.
10-
- setuptools
11-
- setuptools-scm
10+
- setuptools>=77.0.3
11+
- setuptools-scm>=8
1212

1313
# Core dependencies.
1414
- numpy>=2

requirements/py312.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ dependencies:
77
- python=3.12
88

99
# Setup dependencies.
10-
- setuptools
11-
- setuptools-scm
10+
- setuptools>=77.0.3
11+
- setuptools-scm>=8
1212

1313
# Core dependencies.
1414
- numpy>=2

0 commit comments

Comments
 (0)