changeset 53279:6f6d492a6bd3 stable tip

make: build local venv with `--system-site-packages` This is to be consistent with how `run-tests.py` creates the venv in the temp directory. We should also drop `--upgrade-deps` for consistency, but then the build fails (because the venv has `pip` 22.0.4) with: $ make -C .. local PYTHON="py -3.9" make: Entering directory `/c/Users/Matt/projects/mercurial/mercurial-devel' py -3.9 -m venv .venv_cpython3.9 --clear --system-site-packages .venv_cpython3.9/Scripts/python -m \ pip install -e . -v --config-settings --global-option="" Usage: c:\Users\Matt\projects\mercurial\mercurial-devel\.venv_cpython3.9\Scripts\python.exe -m pip install [options] <requirement specifier> [package-index-options] ... c:\Users\Matt\projects\mercurial\mercurial-devel\.venv_cpython3.9\Scripts\python.exe -m pip install [options] -r <requirements file> [package-index-options] ... c:\Users\Matt\projects\mercurial\mercurial-devel\.venv_cpython3.9\Scripts\python.exe -m pip install [options] [-e] <vcs project url> ... c:\Users\Matt\projects\mercurial\mercurial-devel\.venv_cpython3.9\Scripts\python.exe -m pip install [options] [-e] <local project path> ... c:\Users\Matt\projects\mercurial\mercurial-devel\.venv_cpython3.9\Scripts\python.exe -m pip install [options] <archive url/path> ... no such option: --config-settings make: *** [local] Error 2 make: Leaving directory `/c/Users/Matt/projects/mercurial/mercurial-devel' We can't swap that for `--without-pip` like the previous commit, because then the attempt to do an editable install into it fails without `pip`.
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 21 May 2025 17:08:24 -0400
parents 2af8c5560b99
children
files Makefile
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed May 21 11:49:25 2025 -0400
+++ b/Makefile	Wed May 21 17:08:24 2025 -0400
@@ -66,7 +66,7 @@
 
 .PHONY: local
 local:
-	$(PYTHON) -m venv $(VENV_NAME) --clear --upgrade-deps
+	$(PYTHON) -m venv $(VENV_NAME) --clear --upgrade-deps --system-site-packages
 	$(VENV_NAME)/$(PYBINDIRNAME)/python -m \
 	  pip install -e . -v $(PIP_OPTIONS_PURE)
 	env HGRCPATH= $(VENV_NAME)/$(PYBINDIRNAME)/hg version