8000 GH-80789: Get rid of the ``ensurepip`` infra for many wheels by webknjaz · Pull Request #109245 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

GH-80789: Get rid of the ensurepip infra for many wheels #109245

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Jan 30, 2024
Merged

GH-80789: Get rid of the ensurepip infra for many wheels #109245

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c32777f
Get rid of the ``ensurepip`` infra for many wheels
webknjaz Sep 10, 2023
d6e51b2
Rename `_find_packages` to `_get_replacement_pip_package`
webknjaz Sep 15, 2023
5c3bd26
Remove changelog entry
AA-Turner Sep 16, 2023
96b8b9e
Simplify WHEEL_PKG_DIR search
AA-Turner Sep 16, 2023
7b04736
Simplify the pip wheel info
AA-Turner Sep 16, 2023
f3a49c2
Use `pathlib` in `ensurepip` internally
webknjaz Oct 11, 2023
3d7ee78
Drop `os.fsencode` from wheel path preprocessing
webknjaz Oct 11, 2023
72b8ebe
Update replaced `_get_pip_whl_path_ctx` references
webknjaz Oct 11, 2023
0d94ec9
Drop looping from the wheel verification script
webknjaz Oct 12, 2023
5c97cda
Multiline complex wheel path conditional
webknjaz Oct 15, 2023
bce6e3a
Drag the wheel path object through `os.fsdecode`
webknjaz Oct 15, 2023
50efc2a
Use `None`-sentinel for missing alternative wheel
webknjaz Oct 15, 2023
865c41f
Un-f-string alternative wheel path glob
webknjaz Oct 15, 2023
2472d87
Melt the second wheel lookup error into sentinel
webknjaz Oct 15, 2023
da1ae79
Merge branch 'main' into maintenance/ensurepip-single-wheel
pradyunsg Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename _find_packages to _get_replacement_pip_package 
This change is intended to make it clear that the helper now only
returns one package and no more.

Co-Authored-By: vstinner@python.org
  • Loading branch information
@webknjaz
webknjaz committed Jan 25, 2024
commit d6e51b2374628315afe2393a2124f1856a96d96b
6 changes: 3 additions & 3 deletions Lib/ensurepip/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
_WHEEL_PKG_DIR = sysconfig.get_config_var('WHEEL_PKG_DIR')


def _find_packages(path: str | None) -> _Package:
def _get_replacement_pip_package(path: str | None) -> _Package:
if path is None:
raise LookupError(
'The compile-time `WHEEL_PKG_DIR` is unset so there is '
Expand Down Expand Up @@ -70,8 +70,8 @@ def _get_usable_pip_package() -> _Package:
pip_pkg = _Package(_PIP_VERSION, wheel_name, None)

with suppress(LookupError):
# only use the wheel package directory if all packages are found there
pip_pkg = _find_packages(_WHEEL_PKG_DIR)
# only use the wheel package directory if pip wheel is found there
pip_pkg = _get_replacement_pip_package(_WHEEL_PKG_DIR)

return pip_pkg

Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_ensurepip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def setUp(self):
real_devnull = os.devnull
os_patch = unittest.mock.patch("ensurepip.os")
patched_os = os_patch.start()
# But expose os.listdir() used by _find_packages()
# But expose os.listdir() used by _get_replacement_pip_package()
patched_os.listdir = os.listdir
self.addCleanup(os_patch.stop)
patched_os.devnull = real_devnull
Expand Down
0