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

Merge pull request #10858 from rooftopcellist/devel-receptor-runner

Browse Source 
Install receptor and ansible-runner from devel branch
This commit is contained in:
Shane McDonald
2021-08-11 16:43:13 -04:00
committed by GitHub
parent 93ee0a362f 56fd5c435d
commit aa98a5b5e1
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tests/functional/test_licenses.py
View File

@@ -60,6 +60,8 @@ def test_python_and_js_licenses():
(name, version) = reqt.link.filename.split('@', 1) (name, version) = reqt.link.filename.split('@', 1)
if name.endswith('.git'): if name.endswith('.git'):
name = name[:-4] name = name[:-4]
if name == 'receptor':
name = 'receptorctl'
ret[name] = {'name': name, 'version': version} ret[name] = {'name': name, 'version': version}
return ret return ret

2
requirements/requirements.in
View File

@@ -1,5 +1,4 @@
aiohttp aiohttp
ansible-runner==2.0.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
@@ -46,7 +45,6 @@ python-dsv-sdk
python-tss-sdk==1.0.0 python-tss-sdk==1.0.0
python-ldap>=3.3.1 # https://github.com/python-ldap/python-ldap/issues/270 python-ldap>=3.3.1 # https://github.com/python-ldap/python-ldap/issues/270
pyyaml>=5.4.1 # minimum to fix https://github.com/yaml/pyyaml/issues/478 pyyaml>=5.4.1 # minimum to fix https://github.com/yaml/pyyaml/issues/478
receptorctl==1.0.0
schedule==0.6.0 schedule==0.6.0
social-auth-core==3.3.1 # see UPGRADE BLOCKERs social-auth-core==3.3.1 # see UPGRADE BLOCKERs
social-auth-app-django==3.1.0 # see UPGRADE BLOCKERs social-auth-app-django==3.1.0 # see UPGRADE BLOCKERs

6
requirements/requirements.txt
View File

@@ -4,8 +4,7 @@ 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
ansible-runner==2.0.1 # via -r /awx_devel/requirements/requirements_git.txt
# 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
@@ -303,8 +302,7 @@ pyyaml==5.4.1
# djangorestframework-yaml # djangorestframework-yaml
# kubernetes # kubernetes
# receptorctl # receptorctl
receptorctl==1.0.0 # via -r /awx_devel/requirements/requirements_git.txt
# via -r /awx_devel/requirements/requirements.in
redis==3.4.1 redis==3.4.1
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in

2
requirements/requirements_git.txt
View File

@@ -1 +1,3 @@
git+https://github.com/ansible/system-certifi.git@devel#egg=certifi git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
git+https://github.com/ansible/receptor.git@devel#egg=receptorctl&subdirectory=receptorctl