Skip to content

GH-80789: Bundle ensurepip wheels at build time #109130

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
AA-Turner wants to merge 12 commits into from
Closed

GH-80789: Bundle ensurepip wheels at build time #109130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0d8c94f
Remove bundled pip wheel
webknjaz Apr 11, 2019
c2c9a55
Add bundle_ensurepip_wheels
AA-Turner Sep 8, 2023
76de0b8
Remove verify_ensurepip_wheels
AA-Turner Sep 8, 2023
252ee8e
Add Makefile target
AA-Turner Sep 8, 2023
800c487
Merge branch 'main' into ensurepip/bundler-tools
AA-Turner Sep 8, 2023
4f0b3a2
Attempt to fix Cirrus CI
AA-Turner Sep 8, 2023
0aaf135
Integrate into build
AA-Turner Sep 8, 2023
a163396
Revert "Integrate into build"
AA-Turner Sep 8, 2023
ccaad2d
Changes from first review
AA-Turner Sep 9, 2023
db6f0db
Merge branch 'main' into ensurepip/bundler-tools
AA-Turner Sep 9, 2023
8fae12a
Add an explanatory comment to Cirrus CI
AA-Turner Sep 10, 2023
161f304
Merge branch 'main' into ensurepip/bundler-tools
AA-Turner Oct 4, 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
Integrate into build
  • Loading branch information
@AA-Turner
AA-Turner committed Sep 8, 2023
commit 0aaf135d1ea81adabe8fe48134aef450fe14eff2
17 changes: 14 additions & 3 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,13 @@ all: @DEF_MAKE_ALL_RULE@

.PHONY: build_all
build_all: check-clean-src $(BUILDPYTHON) platform sharedmods \
gdbhooks Programs/_testembed scripts checksharedmods rundsymutil
gdbhooks Programs/_testembed scripts checksharedmods rundsymutil \
ensurepip-wheels-stamp

.PHONY: build_wasm
build_wasm: check-clean-src $(BUILDPYTHON) platform sharedmods \
python-config checksharedmods
python-config checksharedmods \
ensurepip-wheels-stamp

# Check that the source is clean when building out of source.
.PHONY: check-clean-src
Expand Down Expand Up @@ -906,6 +908,15 @@ download-ensurepip-wheels: $(BUILDPYTHON) platform
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/bundle_ensurepip_wheels.py ; \
fi

ensurepip-wheels-stamp:
$(MAKE) download-ensurepip-wheels
touch $@

.PHONY: clean-ensurepip-wheels
clean-ensurepip-wheels:
rm -f $(srcdir)/Lib/ensurepip/_bundled/*.whl
rm -f ensurepip-wheels-stamp

##########################################################################
# Build static libmpdec.a
LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
Expand Down Expand Up @@ -2685,7 +2696,7 @@ profile-removal:
rm -f profile-bolt-stamp

.PHONY: clean
clean: clean-retain-profile clean-bolt
clean: clean-retain-profile clean-bolt clean-ensurepip-wheels
@if test @DEF_MAKE_ALL_RULE@ = profile-opt -o @DEF_MAKE_ALL_RULE@ = bolt-opt; then \
rm -f profile-gen-stamp profile-clean-stamp; \
$(MAKE) profile-removal; \
Expand Down
8 changes: 7 additions & 1 deletion PCbuild/regen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,5 +123,11 @@ set PYTHONPATH=$(PySourcePath)Lib
<Message Text="Wrote $(OutDir)LICENSE.txt" Importance="high" />
</Target>

<Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense" />
<Target Name="_RegenEnsurepipWheels">
<Message Text="Bundle wheels for ensurepip" Importance="high" />
<Exec Command="$(PythonForBuild) Tools\build\bundle_ensurepip_wheels.py"
WorkingDirectory="$(PySourcePath)" />
</Target>

<Target Name="PostBuildRegen" DependsOnTargets="_RegenTestFrozenmain;_RegenLicense;_RegenEnsurepipWheels" />
</Project>