mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 10:00:01 -03:30
Merge pull request #11639 from jbradberry/fix-updater-script
Deal properly with comments in requirements_git.txt
This commit is contained in:
commit
9ecceb4a1e
@ -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}"
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user