fix: long-description on Windows #2168
Merged
Conversation
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
Signed-off-by: mayeut <mayeut@users.noreply.github.com>
Signed-off-by: mayeut <mayeut@users.noreply.github.com>
|
@giampaolo, it's probably not as clean is I'd want but thought I'd share this anyway as it's getting late and I probably won't be able to work again on this before the week-end. |
giampaolo
reviewed
Nov 8, 2022
Comment on lines
+47
to
+49
| if len(sys.argv) > 2: | ||
| with open(sys.argv[2], "wb") as f: | ||
| f.write(data.encode("utf8")) |
There was a problem hiding this comment.
Couldn't you simply do data.encode("utf8") from setup.py and avoid editing this file?
There was a problem hiding this comment.
It wasn't missing in my commit (since sys was already used to read the first argument) so I don't know what went wrong on master.
There was a problem hiding this comment.
That's my fault actually. I manually edited @mayeut's PR to get rid of some parts, then merged it.
|
Merging as-is. I will try to fix the encoding stuff in a separate commit. |
ddelange
added a commit
to ddelange/psutil
that referenced
this pull request
Nov 11, 2022
* 'master' of https://github.com/giampaolo/psutil: fix: long-description on Windows (giampaolo#2168) GH actions: update actions' deps to latest version use argparse module in 3 scripts/internal scripts setup.py: provide better err msg if can't compile giampaolo#2164: fix compilation failures on linux < 2.6.27 / CentOS 5 (giampaolo#2171)
giampaolo
added a commit
that referenced
this pull request
Nov 11, 2022
|
Ok, hopefully c0aadb1 should fix this once and for all. |
ddelange
added a commit
to ddelange/psutil
that referenced
this pull request
Nov 11, 2022
* 'master' of https://github.com/giampaolo/psutil: fix long_description on Windows (see: giampaolo#2168) make.bat: use default 'python' exe; get rid of hard-coded python path
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Description
Not sure why the Popen communication is failing on GHA but it inserts a bunch of newlines that shouldn't be there.
This PR uses a temporary file rather than communicating through Popen.