Skip to content

Commit cda26be

Browse files
authored
Merge pull request #8850 from hugovk/pep639
Replace deprecated classifier with licence expression (PEP 639)
2 parents 9f654ff + d8a0cb5 commit cda26be

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.ci/install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [[ $(uname) != CYGWIN* ]]; then
5353
# Pyroma uses non-isolated build and fails with old setuptools
5454
if [[ $GHA_PYTHON_VERSION == 3.9 ]]; then
5555
# To match pyproject.toml
56-
python3 -m pip install "setuptools>=67.8"
56+
python3 -m pip install "setuptools>=77"
5757
fi
5858

5959
# webp

Tests/test_pyroma.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,11 @@ def test_pyroma() -> None:
2323
)
2424

2525
else:
26-
# Should have a perfect score
27-
assert rating == (10, [])
26+
# Should have a perfect score, but pyroma does not support PEP 639 yet.
27+
assert rating == (
28+
9,
29+
[
30+
"Your package does neither have a license field "
31+
"nor any license classifiers."
32+
],
33+
)

pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[build-system]
22
build-backend = "backend"
33
requires = [
4-
"setuptools>=67.8",
4+
"setuptools>=77",
55
]
66
backend-path = [
77
"_custom_build",
@@ -14,14 +14,14 @@ readme = "README.md"
1414
keywords = [
1515
"Imaging",
1616
]
17-
license = { text = "MIT-CMU" }
17+
license = "MIT-CMU"
18+
license-files = [ "LICENSE" ]
1819
authors = [
1920
{ name = "Jeffrey A. Clark", email = "[email protected]" },
2021
]
2122
requires-python = ">=3.9"
2223
classifiers = [
2324
"Development Status :: 6 - Mature",
24-
"License :: OSI Approved :: CMU License (MIT-CMU)",
2525
"Programming Language :: Python :: 3 :: Only",
2626
"Programming Language :: Python :: 3.9",
2727
"Programming Language :: Python :: 3.10",

0 commit comments

Comments
 (0)