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.

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

fix(env): isolated env must validate requirements #10048

Merged
merged 1 commit into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/poetry/utils/isolated_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,17 @@ def install(self, requirements: Collection[str]) -> None:
# We build Poetry dependencies from the requirements
package = ProjectPackage("__root__", "0.0.0")
package.python_versions = ".".join(str(v) for v in self._env.version_info[:3])
env_markers = self._env.get_marker_env()

for requirement in requirements:
dependency = Dependency.create_from_pep_508(requirement)
package.add_dependency(dependency)

if dependency.marker.is_empty() or dependency.marker.validate(env_markers):
# we ignore dependencies that are not valid for this environment
# this ensures that we do not end up with unnecessary constraint
# errors when solving build system requirements; this is assumed
# safe as this environment is ephemeral
package.add_dependency(dependency)

io = BufferedIO()

Expand Down
3 changes: 2 additions & 1 deletion tests/inspection/test_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,8 @@ def test_info_no_setup_pkg_info_no_deps_dynamic(fixture_dir: FixtureDirGetter) -
def test_info_setup_simple(mocker: MockerFixture, demo_setup: Path) -> None:
spy = mocker.spy(VirtualEnv, "run")
info = PackageInfo.from_directory(demo_setup)
assert spy.call_count == 4

assert spy.call_count == 6
demo_check_info(info, requires_dist={"package"})


Expand Down
33 changes: 33 additions & 0 deletions tests/utils/test_isolated_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import shutil
import sys
import uuid

from pathlib import Path
from typing import TYPE_CHECKING
Expand Down Expand Up @@ -56,6 +57,38 @@ def test_isolated_env_install_success(pool: RepositoryPool) -> None:
)


def test_isolated_env_install_discards_requirements_not_needed_by_env(
pool: RepositoryPool,
) -> None:
with ephemeral_environment(Path(sys.executable)) as venv:
env = IsolatedEnv(venv, pool)
assert not InstalledRepository.load(venv).find_packages(
get_dependency("poetry-core")
)

venv_python_version = venv.get_marker_env().get("python_version")
package_one = uuid.uuid4().hex
package_two = uuid.uuid4().hex

env.install(
{
f"poetry-core; python_version=='{venv_python_version}'",
f"{package_one}>=1.0.0; python_version=='0.0'",
f"{package_two}>=2.0.0; platform_system=='Mirrors'",
}
)
abn marked this conversation as resolved.
Show resolved Hide resolved
assert InstalledRepository.load(venv).find_packages(
get_dependency("poetry-core")
)
assert not InstalledRepository.load(venv).find_packages(
get_dependency(package_one)
)

assert not InstalledRepository.load(venv).find_packages(
get_dependency(package_two)
)


@pytest.mark.parametrize(
("requirements", "exception"),
[
Expand Down
Loading