Merge pull request #11639 from jbradberry/fix-updater-script

Deal properly with comments in requirements_git.txt
This commit is contained in:
Jeff Bradberry 2022-01-30 10:16:22 -05:00 committed by GitHub
commit 9ecceb4a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,17 +14,19 @@ _cleanup() {
generate_requirements() {
venv="`pwd`/venv"
echo $venv
/usr/bin/python3.8 -m venv "${venv}"
/usr/bin/python3 -m venv "${venv}"
# shellcheck disable=SC1090
source ${venv}/bin/activate
${venv}/bin/python3.8 -m pip install -U pip pip-tools
${venv}/bin/python3 -m pip install -U pip pip-tools
${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}"
${pip_compile} "${requirements_in}" "${requirements_git}" --output-file requirements.txt
# consider the git requirements for purposes of resolving deps
# Then remove any git+ lines from requirements.txt
while IFS= read -r line; do
sed -i "\!${line%#*}!d" requirements.txt
if [[ $line != \#* ]]; then # ignore comments
sed -i "\!${line%#*}!d" requirements.txt
fi
done < "${requirements_git}"
}