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

rebase and merge conflict resolution (#6692)

Browse Source
This commit is contained in:
Jake Jackson
2024-09-17 12:46:12 -04:00
committed by GitHub
parent d2f3c02945
commit fafed924e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements.in
View File

@@ -64,7 +64,7 @@ requests
slack-sdk slack-sdk
tacacs_plus==1.0 # UPGRADE BLOCKER: auth does not work with later versions tacacs_plus==1.0 # UPGRADE BLOCKER: auth does not work with later versions
twilio twilio
twisted[tls]>=23.10.0 # CVE-2023-46137 twisted[tls]>=24.7.0 # CVE-2024-41810
urllib3>=1.26.19 # CVE-2024-37891 urllib3>=1.26.19 # CVE-2024-37891
uWSGI uWSGI
uwsgitop uwsgitop

6
requirements/requirements.txt
View File

@@ -213,7 +213,7 @@ importlib-metadata==6.2.1
# ansible-runner # ansible-runner
# markdown # markdown
# opentelemetry-api # opentelemetry-api
incremental==22.10.0 incremental==24.7.2
# via twisted # via twisted
inflect==7.0.0 inflect==7.0.0
# via jaraco-text # via jaraco-text
@@ -519,12 +519,13 @@ tempora==5.5.1
# jaraco-logging # jaraco-logging
tomli==2.0.1 tomli==2.0.1
# via # via
# incremental
# maturin # maturin
# setuptools-rust # setuptools-rust
# setuptools-scm # setuptools-scm
twilio==8.13.0 twilio==8.13.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
twisted[tls]==23.10.0 twisted[tls]==24.7.0
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
# daphne # daphne
@@ -580,6 +581,7 @@ setuptools==69.0.2
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
# asciichartpy # asciichartpy
# autobahn # autobahn
# incremental
# opentelemetry-instrumentation # opentelemetry-instrumentation
# python-daemon # python-daemon
# setuptools-rust # setuptools-rust