External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Use ansible-runner 2.1.1 build

Browse Source
This commit is contained in:
Satoe Imaishi
2021-10-20 08:01:45 -04:00
committed by Shane McDonald
parent d67007f777
commit f0ede01017
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
requirements/requirements.in
View File

@@ -1,4 +1,5 @@
aiohttp aiohttp
ansible-runner==2.1.1
ansiconv==1.0.0 # UPGRADE BLOCKER: from 2013, consider replacing instead of upgrading ansiconv==1.0.0 # UPGRADE BLOCKER: from 2013, consider replacing instead of upgrading
asciichartpy asciichartpy
autobahn>=20.12.3 # CVE-2020-35678 autobahn>=20.12.3 # CVE-2020-35678
@@ -59,7 +60,3 @@ uwsgitop
wheel wheel
pip==21.2.4 # see UPGRADE BLOCKERs pip==21.2.4 # see UPGRADE BLOCKERs
setuptools==58.2.0 # 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

5
requirements/requirements.txt
View File

@@ -4,7 +4,8 @@ aiohttp==3.6.2
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
aioredis==1.3.1 aioredis==1.3.1
# via channels-redis # 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 ansiconv==1.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
asciichartpy==1.5.25 asciichartpy==1.5.25
@@ -224,8 +225,6 @@ oauthlib==3.1.0
# social-auth-core # social-auth-core
openshift==0.11.0 openshift==0.11.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
pbr==5.6.0
# via -r /awx_devel/requirements/requirements.in
pexpect==4.7.0 pexpect==4.7.0
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in

2
requirements/requirements_git.txt
View File

@@ -1,4 +1,2 @@
git+https://github.com/ansible/system-certifi.git@devel#egg=certifi 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 https://receptor-nightlies.s3.amazonaws.com/receptorctl/receptorctl-0.0.0-py3-none-any.whl

5
requirements/updater.sh
View File

@@ -23,8 +23,9 @@ generate_requirements() {
${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}" ${pip_compile} --output-file requirements.txt "${requirements_in}" "${requirements_git}"
# consider the git requirements for purposes of resolving deps # consider the git requirements for purposes of resolving deps
# Then remove any git+ lines from requirements.txt # Then remove any git+ lines from requirements.txt
cp requirements.txt requirements_tmp.txt while IFS= read -r line; do
grep -v "^git+" requirements_tmp.txt > requirements.txt && rm requirements_tmp.txt sed -i "\!${line%#*}!d" requirements.txt
done < "${requirements_git}"
} }
main() { main() {