Improve python binary selection logic

- Check all available versions of python3 instead of just the shortlist
- Allow manually overriding using make variables
This commit is contained in:
cyqsimon 2023-07-12 18:44:04 +08:00
parent d44570b557
commit 008ff709c8
No known key found for this signature in database
GPG key ID: 1D8CE2F297390D65
2 changed files with 14 additions and 12 deletions

View file

@ -1,7 +1,11 @@
MAKEFLAGS := --jobs=1
VERSION := $(shell git describe --tag)
COMMIT := $(shell git rev-parse --short HEAD)
PY_BIN := $(shell tools/get-python-bin.sh python)
PIP_BIN := $(shell tools/get-python-bin.sh pip)
.PHONY:
help:
@ -96,16 +100,13 @@ build-deps-ubuntu:
docs: docs-deps docs-build
docs-build: .PHONY
PY=$$(tools/get-python-bin.sh python) && MKDOCS=$$(which mkdocs) && \
$$PY $$MKDOCS build
PY=$$(which $(PY_BIN)) && MKDOCS=$$(which mkdocs) && $$PY $$MKDOCS build
docs-deps: .PHONY
PIP=$$(tools/get-python-bin.sh pip) && \
$$PIP install -r requirements.txt
PIP=$$(which $(PIP_BIN)) && $$PIP install -r requirements.txt
docs-deps-update: .PHONY
PIP=$$(tools/get-python-bin.sh pip) && \
$$PIP install -r requirements.txt --upgrade
PIP=$$(which $(PIP_BIN)) && $$PIP install -r requirements.txt --upgrade
# Web app