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: installing wheel from trailing slash url #4619

Closed
wants to merge 6 commits into from
Closed

fix: installing wheel from trailing slash url #4619

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
97d2d62
fix: installing wheel from trailing slash url
pechersky Oct 10, 2021
28fd302
Incorporate suggestions
pechersky Nov 15, 2021
f8e646f
Merge branch 'master' into pechersky/trailing-slash-wheel
pechersky Nov 15, 2021
a1426d9
pre-commit passing in imports
pechersky Nov 15, 2021
ff98ac3
Merge branch 'master' into pechersky/trailing-slash-wheel
pechersky Dec 16, 2021
27731b3
pre-commit happy
pechersky Dec 16, 2021
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
22 changes: 14 additions & 8 deletions poetry/repositories/pypi_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,14 +432,17 @@ def _get_info_from_urls(self, urls: Dict[str, List[str]]) -> "PackageInfo":
def _get_info_from_wheel(self, url: str) -> "PackageInfo":
from poetry.inspection.info import PackageInfo

pathsplits = urllib.parse.urlparse(url).path.rsplit("/")
neersighted marked this conversation as resolved.
Show resolved Hide resolved
wheelpath = pathsplits[-1]
if not wheelpath:
wheelpath = pathsplits[-2]

self._log(
"Downloading wheel: {}".format(
urllib.parse.urlparse(url).path.rsplit("/")[-1]
),
"Downloading wheel: {}".format(wheelpath),
level="debug",
)

filename = os.path.basename(urllib.parse.urlparse(url).path.rsplit("/")[-1])
filename = os.path.basename(wheelpath)
neersighted marked this conversation as resolved.
Show resolved Hide resolved

with temporary_directory() as temp_dir:
filepath = Path(temp_dir) / filename
neersighted marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -450,14 +453,17 @@ def _get_info_from_wheel(self, url: str) -> "PackageInfo":
def _get_info_from_sdist(self, url: str) -> "PackageInfo":
from poetry.inspection.info import PackageInfo

pathsplits = urllib.parse.urlparse(url).path.rsplit("/")
wheelpath = pathsplits[-1]
if not wheelpath:
wheelpath = pathsplits[-2]

self._log(
"Downloading sdist: {}".format(
urllib.parse.urlparse(url).path.rsplit("/")[-1]
),
"Downloading sdist: {}".format(wheelpath),
level="debug",
)

filename = os.path.basename(urllib.parse.urlparse(url).path)
filename = os.path.basename(wheelpath)

with temporary_directory() as temp_dir:
filepath = Path(temp_dir) / filename
Expand Down