diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f0aeebb551..881c7d6262 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -119,6 +119,7 @@ django==4.2.6 # djangorestframework # drf-spectacular # social-auth-app-django + # via -r /awx_devel/requirements/requirements_git.txt django-auth-ldap==4.1.0 # via # -r /awx_devel/requirements/requirements.in diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index d4820f02d0..fdcab86c47 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -5,4 +5,4 @@ git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner # specifically need https://github.com/robgolding/django-radius/pull/27 git+https://github.com/ansible/django-radius.git@develop#egg=django-radius git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml -git+https://github.com/ansible/django-ansible-base.git@devel#egg=django-ansible-base \ No newline at end of file +git+https://github.com/ansible/django-ansible-base.git@devel#egg=django-ansible-base diff --git a/requirements/updater.sh b/requirements/updater.sh index 6f96a840e5..3650033ce4 100755 --- a/requirements/updater.sh +++ b/requirements/updater.sh @@ -55,7 +55,7 @@ main() { echo "" NEEDS_HELP=1 ;; - esac + esac if [[ "$NEEDS_HELP" == "1" ]] ; then echo "This script generates requirements.txt from requirements.in and requirements_git.in" @@ -76,6 +76,12 @@ main() { exit fi + if [[ ! -z "$(tail -c 1 "${requirements_git}")" ]] + then + echo "No newline at end of ${requirements_git}, please add one" + exit + fi + cp -vf requirements.txt "${_tmp}" cd "${_tmp}"