summaryrefslogtreecommitdiffstats
path: root/requirements
diff options
context:
space:
mode:
Diffstat (limited to 'requirements')
-rw-r--r--requirements/requirements.in5
-rw-r--r--requirements/requirements.txt5
-rw-r--r--requirements/requirements_git.txt2
-rwxr-xr-xrequirements/updater.sh5
4 files changed, 6 insertions, 11 deletions
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 79e76250a7..9d18e42267 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -1,4 +1,5 @@
aiohttp
+ansible-runner==2.1.1
ansiconv==1.0.0 # UPGRADE BLOCKER: from 2013, consider replacing instead of upgrading
asciichartpy
autobahn>=20.12.3 # CVE-2020-35678
@@ -59,7 +60,3 @@ uwsgitop
wheel
pip==21.2.4 # see UPGRADE BLOCKERs
setuptools==58.2.0 # see UPGRADE BLOCKERs
-
-# Temporarily added to use ansible-runner from git branch, to be removed
-# when ansible-runner moves from requirements_git.txt to here
-pbr
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 63b945ec2f..08fe708db3 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -4,7 +4,8 @@ aiohttp==3.6.2
# via -r /awx_devel/requirements/requirements.in
aioredis==1.3.1
# via channels-redis
- # via -r /awx_devel/requirements/requirements_git.txt
+ansible-runner==2.1.1
+ # via -r /awx_devel/requirements/requirements.in
ansiconv==1.0.0
# via -r /awx_devel/requirements/requirements.in
asciichartpy==1.5.25
@@ -224,8 +225,6 @@ oauthlib==3.1.0
# social-auth-core
openshift==0.11.0
# via -r /awx_devel/requirements/requirements.in
-pbr==5.6.0
- # via -r /awx_devel/requirements/requirements.in
pexpect==4.7.0
# via
# -r /awx_devel/requirements/requirements.in
diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
index 13c5dd6bff..8e9e54cc30 100644
--- a/requirements/requirements_git.txt
+++ b/requirements/requirements_git.txt
@@ -1,4 +1,2 @@
git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
-# Remove pbr from requirements.in when moving ansible-runner to requirements.in
-git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
https://receptor-nightlies.s3.amazonaws.com/receptorctl/receptorctl-0.0.0-py3-none-any.whl
diff --git a/requirements/updater.sh b/requirements/updater.sh
index cca8b4a8ad..aa8f31ba70 100755
--- a/requirements/updater.sh
+++ b/requirements/updater.sh
@@ -23,8 +23,9 @@ generate_requirements() {
${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}"
# consider the git requirements for purposes of resolving deps
# Then remove any git+ lines from requirements.txt
- cp requirements.txt requirements_tmp.txt
- grep -v "^git+" requirements_tmp.txt > requirements.txt && rm requirements_tmp.txt
+ while IFS= read -r line; do
+ sed -i "\!${line%#*}!d" requirements.txt
+ done < "${requirements_git}"
}
main() {