Improve python binary selection logic
- Check all available versions of python3 instead of just the shortlist - Allow manually overriding using make variablespull/665/head
parent
d44570b557
commit
008ff709c8
13
Makefile
13
Makefile
|
@ -1,7 +1,11 @@
|
||||||
MAKEFLAGS := --jobs=1
|
MAKEFLAGS := --jobs=1
|
||||||
|
|
||||||
VERSION := $(shell git describe --tag)
|
VERSION := $(shell git describe --tag)
|
||||||
COMMIT := $(shell git rev-parse --short HEAD)
|
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:
|
.PHONY:
|
||||||
|
|
||||||
help:
|
help:
|
||||||
|
@ -96,16 +100,13 @@ build-deps-ubuntu:
|
||||||
docs: docs-deps docs-build
|
docs: docs-deps docs-build
|
||||||
|
|
||||||
docs-build: .PHONY
|
docs-build: .PHONY
|
||||||
PY=$$(tools/get-python-bin.sh python) && MKDOCS=$$(which mkdocs) && \
|
PY=$$(which $(PY_BIN)) && MKDOCS=$$(which mkdocs) && $$PY $$MKDOCS build
|
||||||
$$PY $$MKDOCS build
|
|
||||||
|
|
||||||
docs-deps: .PHONY
|
docs-deps: .PHONY
|
||||||
PIP=$$(tools/get-python-bin.sh pip) && \
|
PIP=$$(which $(PIP_BIN)) && $$PIP install -r requirements.txt
|
||||||
$$PIP install -r requirements.txt
|
|
||||||
|
|
||||||
docs-deps-update: .PHONY
|
docs-deps-update: .PHONY
|
||||||
PIP=$$(tools/get-python-bin.sh pip) && \
|
PIP=$$(which $(PIP_BIN)) && $$PIP install -r requirements.txt --upgrade
|
||||||
$$PIP install -r requirements.txt --upgrade
|
|
||||||
|
|
||||||
# Web app
|
# Web app
|
||||||
|
|
||||||
|
|
|
@ -29,13 +29,14 @@ which pip3 1>/dev/null 2>&1; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check `python3.N` from newest to oldest
|
# list all available `python3.N`, then use the newest that passes checks
|
||||||
CANDIDATE_SUFFIXES=("3.11" "3.10" "3.9" "3.8")
|
# compgen is bash-specific, but we asked for bash in shebang so it's fine
|
||||||
for SUFFIX in ${CANDIDATE_SUFFIXES[@]}; do
|
MINOR_VERSION_CANDIDATES=$(compgen -c | grep -P '^python3\.[0-9]+$' | sed 's/python3\.//' | awk 'int($NF) >= 8' | sort -nr)
|
||||||
|
for MINOR in ${MINOR_VERSION_CANDIDATES[@]}; do
|
||||||
# if both `python3.N` and `pip3.N` are available, use that
|
# if both `python3.N` and `pip3.N` are available, use that
|
||||||
if which "python$SUFFIX" 1>/dev/null 2>&1 && \
|
if which "python3.${MINOR}" 1>/dev/null 2>&1 && \
|
||||||
which "pip$SUFFIX" 1>/dev/null 2>&1; then
|
which "pip3.${MINOR}" 1>/dev/null 2>&1; then
|
||||||
echo "${BIN_PREFIX}${SUFFIX}"
|
echo "${BIN_PREFIX}3.${MINOR}"
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue