Skip to content

Commit 17326d0

Browse files
Update project metadata for PEP 639, take 2 (#21020)
Cherry-pick of #18821, which was reverted in #19052. It's been a year since setuptools v77 was released with PEP 639 support. Hopefully this no longer causes issues downstream? Closes #19389 --------- Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
1 parent 69a0925 commit 17326d0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ jobs:
209209
echo debug build; python -c 'import sysconfig; print(bool(sysconfig.get_config_var("Py_DEBUG")))'
210210
echo os.cpu_count; python -c 'import os; print(os.cpu_count())'
211211
echo os.sched_getaffinity; python -c 'import os; print(len(getattr(os, "sched_getaffinity", lambda *args: [])(0)))'
212-
pip install setuptools==75.1.0 tox==4.26.0
212+
pip install tox==4.26.0
213213
214214
- name: Compiled with mypyc
215215
if: ${{ matrix.test_mypyc }}
@@ -277,7 +277,7 @@ jobs:
277277
default: 3.11.1
278278
command: python -c "import platform; print(f'{platform.architecture()=} {platform.machine()=}');"
279279
- name: Install tox
280-
run: pip install setuptools==75.1.0 tox==4.26.0
280+
run: pip install tox==4.26.0
281281
- name: Setup tox environment
282282
run: tox run -e py --notest
283283
- name: Test

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ requires = [
33
# NOTE: this needs to be kept in sync with mypy-requirements.txt
44
# and build-requirements.txt, because those are both needed for
55
# self-typechecking :/
6-
"setuptools >= 75.1.0",
6+
"setuptools >= 77.0.3",
77
# the following is from mypy-requirements.txt/setup.py
88
"typing_extensions>=4.6.0",
99
"mypy_extensions>=1.0.0",
@@ -31,12 +31,12 @@ features such as type inference, gradual typing, generics and union
3131
types.
3232
""", content-type = "text/x-rst"}
3333
authors = [{name = "Jukka Lehtosalo", email = "jukka.lehtosalo@iki.fi"}]
34-
license = {text = "MIT"}
34+
license = "MIT"
35+
license-files = ["LICENSE", "mypy/typeshed/LICENSE"]
3536
classifiers = [
3637
"Development Status :: 5 - Production/Stable",
3738
"Environment :: Console",
3839
"Intended Audience :: Developers",
39-
"License :: OSI Approved :: MIT License",
4040
"Programming Language :: Python :: 3",
4141
"Programming Language :: Python :: 3.10",
4242
"Programming Language :: Python :: 3.11",

test-requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ psutil>=4.0
1010
pytest>=8.1.0
1111
pytest-xdist>=1.34.0
1212
pytest-cov>=2.10.0
13-
setuptools>=75.1.0
13+
setuptools>=77.0.3
1414
tomli>=1.1.0 # needed even on py311+ so the self check passes with --python-version 3.10
1515
pre_commit>=3.5.0

0 commit comments

Comments
 (0)