Add back git requirements as comments & re-run script (#15317)

* Add back git requirements as comments

* Add comment to commented out git lines for clarity

* Re run the updater script

* Add new licenses

* Fix library name

2 files changed, 26 insertions, 3 deletions

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 403e4871b5..bb9db4571a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -13,6 +13,7 @@ annotated-types==0.6.0
     # via pydantic
 ansi2html==1.9.2
     # via -r /awx_devel/requirements/requirements.in
+# git+https://github.com/ansible/ansible-runner.git@devel  # git requirements installed separately
     # via -r /awx_devel/requirements/requirements_git.txt
 asciichartpy==1.5.25
     # via -r /awx_devel/requirements/requirements.in
@@ -22,6 +23,7 @@ asgiref==3.7.2
     #   channels-redis
     #   daphne
     #   django
+    #   django-ansible-base
     #   django-cors-headers
 asn1==2.7.0
     # via -r /awx_devel/requirements/requirements.in
@@ -39,6 +41,7 @@ autocommand==2.2.2
     # via jaraco-text
 automat==22.10.0
     # via twisted
+# awx-plugins-core @ git+https://git@github.com/ansible/awx-plugins.git@devel  # git requirements installed separately
     # via -r /awx_devel/requirements/requirements_git.txt
 awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
     # via
@@ -81,6 +84,7 @@ botocore==1.34.47
     #   s3transfer
 cachetools==5.3.2
     # via google-auth
+# git+https://github.com/ansible/system-certifi.git@devel  # git requirements installed separately
     # via
     #   -r /awx_devel/requirements/requirements_git.txt
     #   kubernetes
@@ -113,12 +117,17 @@ cryptography==41.0.7
     #   pyjwt
     #   pyopenssl
     #   service-identity
+    #   social-auth-core
 cython==0.29.37
     # via -r /awx_devel/requirements/requirements.in
 daphne==3.0.2
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   channels
+defusedxml==0.7.1
+    # via
+    #   python3-openid
+    #   social-auth-core
 deprecated==1.2.14
     # via
     #   opentelemetry-api
@@ -139,6 +148,8 @@ django==4.2.16
     #   django-polymorphic
     #   django-solo
     #   djangorestframework
+    #   social-auth-app-django
+# django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel  # git requirements installed separately
     # via -r /awx_devel/requirements/requirements_git.txt
 django-cors-headers==4.3.1
     # via -r /awx_devel/requirements/requirements.in
@@ -291,6 +302,7 @@ oauthlib==3.2.2
     #   django-oauth-toolkit
     #   kubernetes
     #   requests-oauthlib
+    #   social-auth-core
 openshift==0.13.2
     # via -r /awx_devel/requirements/requirements.in
 opentelemetry-api==1.24.0
@@ -376,6 +388,7 @@ pyjwt[crypto]==2.8.0
     #   adal
     #   django-ansible-base
     #   msal
+    #   social-auth-core
     #   twilio
 pyopenssl==24.0.0
     # via
@@ -403,6 +416,8 @@ python-tss-sdk==1.2.2
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   awx-plugins-core
+python3-openid==3.2.0
+    # via social-auth-core
 pytz==2024.1
     # via
     #   irc
@@ -442,11 +457,13 @@ requests==2.31.0
     #   python-dsv-sdk
     #   python-tss-sdk
     #   requests-oauthlib
+    #   social-auth-core
     #   twilio
 requests-oauthlib==1.3.1
     # via
     #   kubernetes
     #   msrest
+    #   social-auth-core
 rpds-py==0.18.0
     # via
     #   jsonschema
@@ -478,6 +495,10 @@ slack-sdk==3.27.0
     # via -r /awx_devel/requirements/requirements.in
 smmap==5.0.1
     # via gitdb
+social-auth-app-django==5.4.2
+    # via django-ansible-base
+social-auth-core==4.5.4
+    # via social-auth-app-django
 sqlparse==0.5.1
     # via
     #   -r /awx_devel/requirements/requirements.in
@@ -512,6 +533,7 @@ typing-extensions==4.9.0
 urllib3==1.26.18
     # via
     #   botocore
+    #   django-ansible-base
     #   kubernetes
     #   requests
 uwsgi==2.0.24
diff --git a/requirements/updater.sh b/requirements/updater.sh
index 92b466282d..f7bbcafdd9 100755
--- a/requirements/updater.sh
+++ b/requirements/updater.sh
@@ -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%#*}  # git requirements installed separately!g" requirements.txt
       fi
     done < "${requirements_git}"
   fi;