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
8f196ad6
Unverified
Commit
8f196ad6
authored
Jul 25, 2018
by
Sébastien Eustace
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dependency resolution debug on Python <3.5
parent
777ce76d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
46 additions
and
15 deletions
+46
-15
poetry/puzzle/provider.py
+46
-15
No files found.
poetry/puzzle/provider.py
View file @
8f196ad6
...
...
@@ -409,7 +409,11 @@ class Provider:
continue
if
len
(
by_constraint
)
==
1
:
self
.
debug
(
"Merging requirements for {}"
.
format
(
str
(
deps
[
0
])))
self
.
debug
(
"<debug>Merging requirements for {}</debug>"
.
format
(
str
(
deps
[
0
])
)
)
dependencies
.
append
(
list
(
by_constraint
.
values
())[
0
][
0
])
continue
...
...
@@ -470,11 +474,20 @@ class Provider:
def
debug
(
self
,
message
,
depth
=
0
):
if
message
.
startswith
(
"fact:"
):
if
"depends on"
in
message
:
message
=
re
.
sub
(
"fact: (.+?)(?:(
\
()(.+?)(
\
)))? depends on (.+?)
\
((.+?)
\
)"
,
"<fg=blue>fact</>: <info>
\\
1</info>
\\
2<comment>
\\
3</comment>
\\
4 "
"depends on <info>
\\
5</info> (<comment>
\\
6</comment>)"
,
message
,
m
=
re
.
match
(
"fact: (.+?) depends on (.+?)
\
((.+?)
\
)"
,
message
)
m2
=
re
.
match
(
"(.+?)
\
((.+?)
\
)"
,
m
.
group
(
1
))
if
m2
:
name
=
m2
.
group
(
1
)
version
=
" (<comment>{}</comment>)"
.
format
(
m2
.
group
(
2
))
else
:
name
=
m
.
group
(
1
)
version
=
""
message
=
(
"<fg=blue>fact</>: <info>{}</info>{} "
"depends on <info>{}</info> (<comment>{}</comment>)"
.
format
(
name
,
version
,
m
.
group
(
2
),
m
.
group
(
3
)
)
)
else
:
message
=
re
.
sub
(
...
...
@@ -489,17 +502,35 @@ class Provider:
message
,
)
elif
message
.
startswith
(
"derived:"
):
message
=
re
.
sub
(
"derived: (.+?)(?:(
\
()(.+?)(
\
)))?$"
,
"<fg=blue>derived</>: <info>
\\
1</info>
\\
2<comment>
\\
3</comment>
\\
4"
,
message
,
m
=
re
.
match
(
"derived: (.+?)
\
((.+?)
\
)$"
,
message
)
if
m
:
message
=
"<fg=blue>derived</>: <info>{}</info> (<comment>{}</comment>)"
.
format
(
m
.
group
(
1
),
m
.
group
(
2
)
)
else
:
message
=
"<fg=blue>derived</>: <info>{}</info>"
.
format
(
message
.
split
(
"derived: "
)[
1
]
)
elif
message
.
startswith
(
"conflict:"
):
message
=
re
.
sub
(
"conflict: (.+?)(?:(
\
()(.+?)(
\
)))? depends on (.+?)
\
((.+?)
\
)"
,
"<fg=red;options=bold>conflict</>: <info>
\\
1</info>
\\
2<comment>
\\
3</comment>
\\
4 "
"depends on <info>
\\
5</info> (<comment>
\\
6</comment>)"
,
message
,
m
=
re
.
match
(
"conflict: (.+?) depends on (.+?)
\
((.+?)
\
)"
,
message
)
if
m
:
m2
=
re
.
match
(
"(.+?)
\
((.+?)
\
)"
,
m
.
group
(
1
))
if
m2
:
name
=
m2
.
group
(
1
)
version
=
" (<comment>{}</comment>)"
.
format
(
m2
.
group
(
2
))
else
:
name
=
m
.
group
(
1
)
version
=
""
message
=
(
"<fg=red;options=bold>conflict</>: <info>{}</info>{} "
"depends on <info>{}</info> (<comment>{}</comment>)"
.
format
(
name
,
version
,
m
.
group
(
2
),
m
.
group
(
3
)
)
)
else
:
message
=
"<fg=red;options=bold>conflict</>: {}"
.
format
(
message
.
split
(
"conflict: "
)[
1
]
)
message
=
message
.
replace
(
"! "
,
"<error>!</error> "
)
...
...
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