Skip to content

Comments

fix: append subdirectory to archive path (#7575)#7580

Merged
radoering merged 3 commits intopython-poetry:masterfrom
harrymander:subdir-fix
Mar 4, 2023
Merged

fix: append subdirectory to archive path (#7575)#7580
radoering merged 3 commits intopython-poetry:masterfrom
harrymander:subdir-fix

Conversation

@harrymander
Copy link
Contributor

Resolves: #7575

  • Added tests for changed code.
  • Updated documentation for changed code. (N/A)

From @nikowatari's suggestion (#755 (comment)) with added test.

Copy link
Member

@radoering radoering left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

In addition, I think we can remove

assert package.source_url is not None
if package.root_dir:
req = package.root_dir / package.source_url
else:
req = Path(package.source_url).resolve(strict=False)
if package.source_subdirectory:
req /= package.source_subdirectory

because this part was supposed to consider the subdirectory but apparently it does nothing.

@radoering
Copy link
Member

Actually, if we remove this code, we don't need _prepare_directory_archive at all, but can call _prepare_archive directly. 🤔

@harrymander
Copy link
Contributor Author

Yep those lines do nothing... have removed

@harrymander harrymander requested a review from radoering March 3, 2023 22:02
@radoering radoering added area/installer Related to the dependency installer impact/backport Requires backport to stable branch backport/1.4 labels Mar 4, 2023
@radoering radoering merged commit f27308f into python-poetry:master Mar 4, 2023
poetry-bot bot pushed a commit that referenced this pull request Mar 4, 2023
radoering pushed a commit that referenced this pull request Mar 4, 2023
@harrymander harrymander deleted the subdir-fix branch March 5, 2023 08:10
@github-actions
Copy link

github-actions bot commented Mar 3, 2024

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area/installer Related to the dependency installer impact/backport Requires backport to stable branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

"subdirectory" argument ignored

2 participants