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

Fix certain hash miss matches in case of non weel installations #7594

Merged
merged 16 commits into from
Mar 7, 2023
Merged

Fix certain hash miss matches in case of non weel installations #7594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5b16309
Adjusted Chef.prepare() to allways write to a temporary directory. Ot…
quantum-byte Mar 2, 2023
cb35709
Fixed formatting and linting issues
quantum-byte Mar 2, 2023
cead0bb
First solution with broken test
quantum-byte Mar 4, 2023
65c36b2
Fix the test by also providing the non_wheel archive hash
quantum-byte Mar 4, 2023
6143b4e
remove validate flag for now
quantum-byte Mar 4, 2023
87181dc
Implement review suggestions to also make add the hash for cached non…
quantum-byte Mar 5, 2023
bca4289
make mypy happy and improve some code comments
quantum-byte Mar 5, 2023
5bc6c03
Fix test_executor_should_write_pep610_url_references_for_non_wheel_ur…
quantum-byte Mar 6, 2023
e672978
make flake happy and removed some print debug statements :)
quantum-byte Mar 6, 2023
9029971
make flake really happy
quantum-byte Mar 6, 2023
62d92ba
Code review improvements
quantum-byte Mar 6, 2023
ede8dbb
Further code review improvements and minor test improvements (cleanup…
quantum-byte Mar 6, 2023
1d844c0
Improved tests further
quantum-byte Mar 6, 2023
1772a6a
refactor test mocking logic
quantum-byte Mar 7, 2023
41e2727
Additional Review improvements
quantum-byte Mar 7, 2023
1e1c331
coding style
radoering Mar 7, 2023
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
Prev Previous commit
Next Next commit
Code review improvements
  • Loading branch information
@quantum-byte
quantum-byte committed Mar 6, 2023
commit 62d92baf7206a24ea86cdddc4c1765d79f204f73
2 changes: 1 addition & 1 deletion src/poetry/installation/chef.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def _should_prepare(self, archive: Path) -> bool:
def _is_wheel(cls, archive: Path) -> bool:
return archive.suffix == ".whl"

def get_cached_archive_for_link(self, link: Link, strict: bool) -> Path | None:
def get_cached_archive_for_link(self, link: Link, *, strict: bool) -> Path | None:
archives = self.get_cached_archives_for_link(link)
if not archives:
return None
Expand Down
27 changes: 13 additions & 14 deletions tests/installation/test_executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

from httpretty.core import HTTPrettyRequest
from pytest_mock import MockerFixture
from typing_extensions import Self

from poetry.config.config import Config
from poetry.installation.operations.operation import Operation
Expand Down Expand Up @@ -741,7 +740,7 @@ def test_executor_should_write_pep610_url_references_for_editable_directories(
)


@pytest.mark.parametrize("cached", [False, True])
@pytest.mark.parametrize("is_artifact_cached", [False, True])
def test_executor_should_write_pep610_url_references_for_wheel_urls(
tmp_venv: VirtualEnv,
pool: RepositoryPool,
Expand All @@ -750,9 +749,9 @@ def test_executor_should_write_pep610_url_references_for_wheel_urls(
mock_file_downloads: None,
mocker: MockerFixture,
fixture_dir: FixtureDirGetter,
cached: bool,
is_artifact_cached: bool,
):
if cached:
if is_artifact_cached:
link_cached = fixture_dir("distributions") / "demo-0.1.0-py2.py3-none-any.whl"
mocker.patch(
"poetry.installation.chef.Chef.get_cached_archive_for_link",
Expand Down Expand Up @@ -787,7 +786,7 @@ def test_executor_should_write_pep610_url_references_for_wheel_urls(
verify_installed_distribution(tmp_venv, package, expected_url_reference)


@pytest.mark.parametrize("cached", [False, True])
@pytest.mark.parametrize("is_artifact_cached", [False, True])
def test_executor_should_write_pep610_url_references_for_non_wheel_urls(
tmp_venv: VirtualEnv,
pool: RepositoryPool,
Expand All @@ -796,21 +795,21 @@ def test_executor_should_write_pep610_url_references_for_non_wheel_urls(
mock_file_downloads: None,
mocker: MockerFixture,
fixture_dir: FixtureDirGetter,
cached: bool,
is_artifact_cached: bool,
):
if cached:
link_cached = fixture_dir("distributions") / "demo-0.1.0.tar.gz"
original_func = Chef.get_cached_archive_for_link
if is_artifact_cached:
cached_sdist = fixture_dir("distributions") / "demo-0.1.0.tar.gz"
cached_wheel = fixture_dir("distributions") / "demo-0.1.0-py2.py3-none-any.whl"

def mock_get_cached_archive_for_link(self: Self, link: Link, strict: bool):
if link.filename == "demo-0.1.0.tar.gz":
return link_cached
def mock_get_cached_archive_for_link(_: Link, strict: bool):
if strict:
return cached_sdist
else:
return original_func(self, link, strict)
return cached_wheel

mocker.patch(
"poetry.installation.chef.Chef.get_cached_archive_for_link",
new=mock_get_cached_archive_for_link,
side_effect=mock_get_cached_archive_for_link,
)
package = Package(
"demo",
Expand Down