More pkg_resources refactoring #10511
Conversation
uranusjr
force-pushed
the
metadata-uninstall
branch
from
95c8722
to
0c1dec0
Compare
uranusjr
added
the
skip news
uranusjr
force-pushed
the
metadata-uninstall
branch
4 times, most recently
from
05eb831
to
d90011e
Compare
|
PEP 660 editables are regular wheels so uninstallation should not have to care that they are editables. |
github-actions
bot
added
the
needs rebase or merge
|
The "problem" is old editables do need special treatments, so uninstallation code needs to distinguish whether an editable is legacy or not so PEP 660 editables don't incorrectly fall into the legacy code path :p (More specifically, |
Sure. But do you mean we should worry about uninstallation bugs now that PEP 660 is merged, or is your concern specific to this PR ? |
|
Specific to this PR. |
uranusjr
force-pushed
the
metadata-uninstall
branch
from
d90011e
to
0034cb1
Compare
uranusjr
force-pushed
the
metadata-uninstall
branch
2 times, most recently
from
78e6a76
to
9d42d7b
Compare
|
This is rebased against main so I think PEP 660 should be covered correctly. |
github-actions
bot
added
the
needs rebase or merge
uranusjr
force-pushed
the
metadata-uninstall
branch
from
9d42d7b
to
35ec437
Compare
|
Anyone interested in taking a look at this? |
|
Ping me again at the weekend, and I'll try to take a look then. |
|
I'll take a look tomorrow morning. |
| paths_to_remove = [exe_name] | ||
| if WINDOWS: | ||
| paths_to_remove.append(exe_name + ".exe") | ||
| paths_to_remove.append(exe_name + ".exe.manifest") | ||
| if is_gui: | ||
| paths_to_remove.append(exe_name + "-script.pyw") | ||
| else: | ||
| paths_to_remove.append(exe_name + "-script.py") | ||
| return paths_to_remove | ||
| yield exe_name | ||
| if not WINDOWS: | ||
| return | ||
| yield f"{exe_name}.exe" | ||
| yield f"{exe_name}.exe.manifest" | ||
| if is_gui: | ||
| yield f"{exe_name}-script.pyw" | ||
| else: | ||
| yield f"{exe_name}-script.py" |
| if "/$platlibdir/" in platlib and hasattr(sys, "platlibdir"): | ||
| platlib = platlib.replace("/$platlibdir/", f"/{sys.platlibdir}/") | ||
| if "/$platlibdir/" in platlib: | ||
| platlib = platlib.replace("/$platlibdir/", f"/{_PLATLIBDIR}/") |
There was a problem hiding this comment.
This seems unrelated to the rest of the changes.
There was a problem hiding this comment.
Yup, but it seems like the right thing to do; and I imagine it's here because TP noticed this bug while working on this. :)
Relevant definition has a fallback to lib if sys.platlibdir isn't defined. (see line 46)
There was a problem hiding this comment.
Sorry, I wasn't suggesting it shouldn't be done. And I have no objection to it being in this PR. I was mostly flagging it in case there was a reason it needed to be here that I'd missed 😉
There was a problem hiding this comment.
If I remember the details correctly (it’s been a while), this was fixing a Mypy error that somehow only shows up when I was working on this. I don’t know why main isn’t complaining, maybe it’s due to me running Mypy on Windows? Not sure, and this new code is margianlly better anyway.
Note that this does not actually change any behaviour because before 3.9, the /$platlibdir/ was just /lib/, and after 3.9 _PLATLIBDIR is always sys.platlibdir. It’s just Mypy is not smart enough to figure that out.
|
Any more comments on this one? |
TODO: This will need review to make sure uninstallation works for PEP 660 editables.