8000 GH-80789: Bundle ``ensurepip`` wheels at build time by AA-Turner · Pull Request #109130 · python/cpython · GitHub
[go: up one dir, main page]

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.

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 12 commits into from
Prev Previous commit
Next Next commit
Add Makefile target
  • Loading branch information
AA-Turner committed Sep 8, 2023
commit 252ee8e53a9a4d417fc1169305902b21da6bf790
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,12 @@ jobs:
- name: Remount sources writable for tests
# some tests write to srcdir, lack of pyc files slows down testing
run: sudo mount $CPYTHON_RO_SRCDIR -oremount,rw
# Download wheels for the venv step
- name: Download ensurepip wheels
env:
SSL_CERT_DIR: /etc/ssl/certs
run: make download-ensurepip-wheels
working-directory: ${{ env.CPYTHON_BUILDDIR }}
- name: Setup directory envs for out-of-tree builds
run: |
echo "CPYTHON_BUILDDIR=$(realpath -m ${GITHUB_WORKSPACE}/../cpython-builddir)" >> $GITHUB_ENV
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/reusable-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ jobs:
run: ./configure --with-pydebug
- name: 'Build CPython'
run: make -j4
# Download wheels for the venv step
- name: 'Download ensurepip wheels'
run: make download-ensurepip-wheels
- name: 'Install build dependencies'
run: make -C Doc/ PYTHON=../python venv
# Use "xvfb-run" since some doctest tests open GUI windows
Expand Down
8 changes: 8 additions & 0 deletions Makefile.pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -899,6 +899,14 @@ python.html: $(srcdir)/Tools/wasm/python.html python.worker.js
python.worker.js: $(srcdir)/Tools/wasm/python.worker.js
@cp $(srcdir)/Tools/wasm/python.worker.js $@

##########################################################################
# Bundle wheels for ensurepip
.PHONY: download-ensurepip-wheels
download-ensurepip-wheels: $(BUILDPYTHON) platform
if test "x$(ENSUREPIP)" != "xno" ; then \
$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/build/bundle_ensurepip_wheels.py ; \
fi

##########################################################################
# Build static libmpdec.a
LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
Expand Down
0