Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move static-checkers-only dependencies into their dedicated extras #4586

Merged
merged 1 commit into from
Aug 23, 2024
Merged

Move static-checkers-only dependencies into their dedicated extras #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@ test = [
# for tools/finalize.py
'jaraco.develop >= 7.21; python_version >= "3.9" and sys_platform != "cygwin"',
"pytest-home >= 0.5",
# pin mypy version so a new version doesn't suddenly cause the CI to fail,
# until types-setuptools is removed from typeshed.
# For help with static-typing issues, or mypy update, ping @Avasam
"mypy==1.11.*",
# No Python 3.11 dependencies require tomli, but needed for type-checking since we import it directly
"tomli",
# No Python 3.12 dependencies require importlib_metadata, but needed for type-checking since we import it directly
"importlib_metadata",
"pytest-subprocess",

# workaround for pypa/setuptools#4333
Expand Down Expand Up @@ -134,6 +126,11 @@ type = [
"pytest-mypy",

# local

# pin mypy version so a new version doesn't suddenly cause the CI to fail,
# until types-setuptools is removed from typeshed.
# For help with static-typing issues, or mypy update, ping @Avasam
"mypy==1.11.*",
]


Expand Down
5 changes: 2 additions & 3 deletions setuptools/tests/integration/test_pip_install_sdist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,12 @@ def build_deps(package, sdist_file):
"Manually" install them, since pip will not install build
deps with `--no-build-isolation`.
"""
import tomli as toml

# delay importing, since pytest discovery phase may hit this file from a
# testenv without tomli
from setuptools.compat.py310 import tomllib

archive = Archive(sdist_file)
info = toml.loads(_read_pyproject(archive))
info = tomllib.loads(_read_pyproject(archive))
deps = info.get("build-system", {}).get("requires", [])
deps += EXTRA_BUILD_DEPS.get(package, [])
# Remove setuptools from requirements (and deduplicate)
Expand Down
Loading