Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
python-poetry
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
python-poetry
Commits
cf12d882
Unverified
Commit
cf12d882
authored
Jul 25, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix information retrieval from zip and bz2 archives
parent
fccd732e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
CHANGELOG.md
+1
-0
poetry/repositories/pypi_repository.py
+10
-2
No files found.
CHANGELOG.md
View file @
cf12d882
...
...
@@ -10,6 +10,7 @@
-
Fixed missing dependency information for some packages.
-
Fixed handling of single versions when packaging.
-
Fixed dependency information retrieval from
`.zip`
and
`.bz2`
archives.
## [0.11.2] - 2018-07-03
...
...
poetry/repositories/pypi_repository.py
View file @
cf12d882
...
...
@@ -280,7 +280,7 @@ class PyPiRepository(Repository):
if
dist_type
not
in
[
"sdist"
,
"bdist_wheel"
]:
continue
if
dist_type
==
"sdist"
and
"dist"
not
in
urls
:
if
dist_type
==
"sdist"
and
"
s
dist"
not
in
urls
:
urls
[
url
[
"packagetype"
]]
=
url
[
"url"
]
continue
...
...
@@ -340,8 +340,15 @@ class PyPiRepository(Repository):
self
,
urls
):
# type: (Dict[str, str]) -> Dict[str, Union[str, List, None]]
if
"bdist_wheel"
in
urls
:
self
.
_log
(
"Downloading wheel: {}"
.
format
(
urls
[
"bdist_wheel"
]
.
split
(
"/"
)[
-
1
]),
level
=
"debug"
,
)
return
self
.
_get_info_from_wheel
(
urls
[
"bdist_wheel"
])
self
.
_log
(
"Downloading sdist: {}"
.
format
(
urls
[
"sdist"
]
.
split
(
"/"
)[
-
1
]),
level
=
"debug"
)
return
self
.
_get_info_from_sdist
(
urls
[
"sdist"
])
def
_get_info_from_wheel
(
...
...
@@ -411,6 +418,7 @@ class PyPiRepository(Repository):
gz
=
BZ2File
(
str
(
filepath
))
else
:
gz
=
GzipFile
(
str
(
filepath
))
suffix
=
".tar.gz"
tar
=
tarfile
.
TarFile
(
str
(
filepath
),
fileobj
=
gz
)
...
...
@@ -423,7 +431,7 @@ class PyPiRepository(Repository):
tar
.
close
()
unpacked
=
Path
(
temp_dir
)
/
"unpacked"
sdist_dir
=
unpacked
/
Path
(
filename
)
.
name
.
rstrip
(
".tar.gz"
)
sdist_dir
=
unpacked
/
Path
(
filename
)
.
name
.
rstrip
(
suffix
)
# Checking for .egg-info at root
eggs
=
list
(
sdist_dir
.
glob
(
"*.egg-info"
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment