-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Improve the debug log message when installing an incompatible wheel #6540
Merged
cjerdonek
merged 1 commit into
pypa:master
from
cjerdonek:issue-6121-incompatible-wheel-message
May 26, 2019
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Include the wheel's tags in the log message explanation when a candidate | ||
wheel link is found incompatible. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,7 +105,10 @@ def test_command_line_append_flags(script, virtualenv, data): | |
"Analyzing links from page https://test.pypi.org" | ||
in result.stdout | ||
) | ||
assert "Skipping link %s" % data.find_links in result.stdout | ||
assert ( | ||
'Skipping link: not a file: {}'.format(data.find_links) in | ||
result.stdout | ||
), 'stdout: {}'.format(result.stdout) | ||
|
||
|
||
@pytest.mark.network | ||
|
@@ -127,7 +130,10 @@ def test_command_line_appends_correctly(script, data): | |
"Analyzing links from page https://test.pypi.org" | ||
in result.stdout | ||
), result.stdout | ||
assert "Skipping link %s" % data.find_links in result.stdout | ||
assert ( | ||
'Skipping link: not a file: {}'.format(data.find_links) in | ||
result.stdout | ||
), 'stdout: {}'.format(result.stdout) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As above. |
||
|
||
|
||
def test_config_file_override_stack(script, virtualenv): | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIRC this can just be
, result
, right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried this out, and what happens is it adds other sections of info like
-- stderr: ---
,-- created: ----
, and-- updated: ---
(in addition to-- stdout: ----
). Since those other sections can also be long and aren't needed, I think it might be better not to include them.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd say they're useful diagnostic information (like an error getting logged on stderr by the networking stuff) or something like that.
I'll leave it to you to decide on what to include here since it's not worth too long a discussion anyway.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll just leave it off. Normally, the test runner includes lots of surrounding info already. It's just when you can't see the string being checked against where it gets annoying (which was the reason for adding it) -- because it truncates long strings.