Skip to content

Commit 9a0c64c

Browse files
committed
Install: Version of setuptools moved to pyproject.toml
Setuptools are listed as both build and runtime dependency (because we need pkg_resources during runtime), which makes it no longer necessary to upgrade setuptools before building. We don't pin the exact version in constraints.txt, because "pip freeze" surprisingly skips setuptools.
1 parent 058130a commit 9a0c64c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def create_venv() -> None:
9595
venv.create(str(target_path), symlinks=True, with_pip=True, prompt=target_path.name)
9696
subprocess.run(
9797
# setuptools >= 81 deprecate pkg_resources
98-
[str(target_path / 'bin/pip'), 'install', '-U', 'pip', 'setuptools <81', 'wheel'],
98+
[str(target_path / 'bin/pip'), 'install', '-U', 'pip', 'wheel'],
9999
check=True)
100100

101101

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies = [
3333
"pyxdg>=0.26,<0.29", # https://freedesktop.org/wiki/Software/pyxdg/
3434
"Jinja2>=2.10,<2.11", # http://jinja.pocoo.org/docs/latest/changelog/
3535
"markdown-it-py==3.0.0", # https://github.com/executablebooks/markdown-it-py/blob/master/CHANGELOG.md
36+
"setuptools>=80,<81", # https://setuptools.pypa.io/en/latest/history.html
3637

3738
# See https://github.com/pallets/markupsafe/issues/286 but breaking change in
3839
# MarkupSafe causes jinja to break
@@ -71,5 +72,5 @@ devel = [
7172
]
7273

7374
[build-system]
74-
requires = ["setuptools < 81", "babel == 2.12.1"]
75+
requires = ["setuptools>=80,<81", "babel==2.12.1"]
7576
build-backend = "setuptools.build_meta"

0 commit comments

Comments
 (0)