Skip to content

Commit

Permalink
Add back git requirements as comments
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanCoding committed Jul 1, 2024
1 parent 98bbc83 commit 413f59d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
# git+https://github.com/ansible/ansible-runner.git@devel
# via -r /awx_devel/requirements/requirements_git.txt
ansiconv==1.0.0
# via -r /awx_devel/requirements/requirements.in
Expand Down Expand Up @@ -77,6 +78,7 @@ botocore==1.34.47
# s3transfer
cachetools==5.3.2
# via google-auth
# git+https://github.com/ansible/system-certifi.git@devel
# via
# -r /awx_devel/requirements/requirements_git.txt
# kubernetes
Expand Down Expand Up @@ -142,6 +144,7 @@ django==4.2.10
# django-solo
# djangorestframework
# social-auth-app-django
# django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel
# via -r /awx_devel/requirements/requirements_git.txt
django-auth-ldap==4.6.0
# via -r /awx_devel/requirements/requirements.in
Expand Down Expand Up @@ -433,6 +436,7 @@ python-tss-sdk==1.2.2
# via -r /awx_devel/requirements/requirements.in
python3-openid==3.2.0
# via social-auth-core
# git+https://github.com/ansible/python3-saml.git@devel
# via -r /awx_devel/requirements/requirements_git.txt
pytz==2024.1
# via
Expand Down
7 changes: 4 additions & 3 deletions requirements/updater.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ generate_requirements() {

${pip_compile} $1 --output-file requirements.txt
# consider the git requirements for purposes of resolving deps
# Then remove any git+ lines from requirements.txt
# Then comment out any git+ lines from requirements.txt
if [[ "$sanitize_git" == "1" ]] ; then
while IFS= read -r line; do
if [[ $line != \#* ]]; then # ignore comments
sed -i "\!${line%#*}!d" requirements.txt
if [[ $line != \#* ]]; then # ignore lines which are already comments
# Add # to the start of any line matched
sed -i "s!^.*${line%#*}!# ${line%#*}!g" requirements.txt
fi
done < "${requirements_git}"
fi;
Expand Down

0 comments on commit 413f59d

Please sign in to comment.