10000 gh-80789: Implement build-time pip bundling in ``ensurepip`` by webknjaz · Pull Request #12791 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-80789: Implement build-time pip bundling in ensurepip #12791

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

Closed
wants to merge 14 commits into from
Closed

gh-80789: Implement build-time pip bundling in ensurepip #12791

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c31bdca
👷Implement build-time pip bundling @ `ensurepip`
webknjaz Aug 26, 2023
abe7339
Resolve file path @ `test_get_packages_with_dir`
webknjaz Aug 28, 2023
d2ae980
Download ensurepip pip dist @ ASAN GHA job
webknjaz Aug 28, 2023
5bf0cda
Run ensurepip bundle generation @ Win on GHA
webknjaz Aug 28, 2023
388113b
Expose TLS trust store to ASAN build @ GHA
webknjaz Aug 28, 2023
6edef14
Call `ensurepip.bundle` @ win build script
webknjaz Aug 28, 2023
7be49ec
Invoke ensurepip.bundle via built Python @ Win
webknjaz Aug 28, 2023
ae92ab9
Depend on dynamic default target @ make
webknjaz Aug 28, 2023
0178658
Update the equality check with `==` @ Win build
webknjaz Aug 28, 2023
00c761f
Revert "Run ensurepip bundle generation @ Win on GHA"
webknjaz Aug 28, 2023
f4bf361
Use case-insensitive comparison @ win build script
webknjaz Aug 28, 2023
2615fe8
In download pip into ensurepip @ Azure Pipelines
webknjaz Aug 28, 2023
2ed185f
Rename make target to `download-ensurepip-blobs`
webknjaz Aug 28, 2023
8d1ddcb
Call built Python via `python.bat` @ win build
webknjaz Aug 28, 2023
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 make target to download-ensurepip-blobs 
Per suggestion at
#12791 (comment).

Co-Authored-By: Zachary Ware <zach@python.org>
  • Loading branch information
@webknjaz @zware
webknjaz and zware committed Aug 28, 2023
commit 2ed185ff026d3be5432eeaffa2619605625426ce
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ jobs:
- name: Bundle ensurepip dists
env:
SSL_CERT_DIR: /etc/ssl/certs
run: make bundle-ensurepip-dists
run: make download-ensurepip-blobs
working-directory: ${{ env.CPYTHON_BUILDDIR }}
- name: Tests
working-directory: ${{ env.CPYTHON_BUILDDIR }}
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:
- name: Bundle ensurepip dists
env:
SSL_CERT_DIR: /etc/ssl/certs
run: make bundle-ensurepip-dists
run: make download-ensurepip-blobs
working-directory: ${{ env.CPYTHON_BUILDDIR }}
- name: Setup directory envs for out-of-tree builds
run: |
Expand Down
6 changes: 3 additions & 3 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ build_all: check-clean-src $(BUILDPYTHON) platform sharedmods \
gdbhooks Programs/_testembed scripts checksharedmods rundsymutil

.PHONY: all-with-ensurepip-dists-bundled
all-with-ensurepip-dists-bundled: @DEF_MAKE_ALL_RULE@ bundle-ensurepip-dists
all-with-ensurepip-dists-bundled: @DEF_MAKE_ALL_RULE@ download-ensurepip-blobs

.PHONY: build_wasm
build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \
Expand Down Expand Up @@ -2762,8 +2762,8 @@ patchcheck: all
check-limited-abi: all
$(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/build/stable_abi.py --all $(srcdir)/Misc/stable_abi.toml

.PHONY: bundle-ensurepip-dists
bundle-ensurepip-dists: $(BUILDPYTHON) platform
.PHONY: download-ensurepip-blobs
download-ensurepip-blobs: $(BUILDPYTHON) platform
if test "x$(ENSUREPIP)" != "xno" ; then \
PYTHONPATH="$(abs_builddir)/Lib" \
$(RUNSHARED) $(abs_builddir)/$(PYTHON_FOR_BUILD) -m \
Expand Down
4 changes: 2 additions & 2 deletions Misc/NEWS.d/next/Library/2019-04-11-22-21-28.bpo-36608.HFoazc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Replaced vendoring of pip blob in the CPython Git tree with a
build-time download and caching mechanism.
``Makefile`` now has a ``bundle-ensurepip-dists`` target to make
bundling Pip wheel more convenient.
``Makefile`` now has a ``download-ensurepip-blobs`` target to
make bundling Pip wheel more convenient.
0