Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2

requirements/README.md

@@ -74,3 +74,4 @@ If modifying this library make sure testing with the offline build is performed
 
 Version 4.8 makes us a little bit nervous with changes to `searchwindowsize` https://github.com/pexpect/pexpect/pull/579/files
 Pin to `pexpect==4.7.x` until we have more time to move to `4.8` and test.
+

requirements/requirements.in

@@ -1,4 +1,3 @@
-
 aiohttp>=3.9.4 # CVE-2024-30251
 ansi2html  # Used to format the stdout from jobs into html for display
 jq  # used for indirect host counting feature
@@ -29,7 +28,7 @@ filelock
 GitPython>=3.1.37  # CVE-2023-41040
 grpcio
 irc
-jinja2>=3.1.3  # CVE-2024-22195
+jinja2>=3.1.6  # CVE-2025-27516
 JSON-log-formatter
 jsonschema
 Markdown  # used for formatting API help
@@ -47,9 +46,10 @@ prometheus_client
 psycopg
 psutil
 pygerduty
+PyGithub <= 2.6.0
 pyopenssl>=23.2.0  # resolve dep conflict from cryptography pin above
 pyparsing==2.4.6  # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or'  (at char 15), (line:1, col:16)
-python-daemon>3.0.0
+python-daemon
 python-dsv-sdk>=1.0.4
 python-tss-sdk>=1.2.1
 pyyaml>=6.0.2  # require packing fix for cython 3 or higher
@@ -60,14 +60,20 @@ redis[hiredis]
 requests
 slack-sdk
 twilio
-twisted[tls]>=23.10.0  # CVE-2023-46137
-uWSGI
+twisted[tls]>=24.7.0  # CVE-2024-41810
+urllib3>=1.26.19 # CVE-2024-37891
+uWSGI>=2.0.28
 uwsgitop
 wheel>=0.38.1  # CVE-2022-40898
 pip==21.2.4  # see UPGRADE BLOCKERs
-setuptools<71.0.0  # see UPGRADE BLOCKERs, path hack in v71 breaks irc deps
+setuptools==80.9.0  # see UPGRADE BLOCKERs
 setuptools_scm[toml]  # see UPGRADE BLOCKERs, xmlsec build dep
 setuptools-rust>=0.11.4  # cryptography build dep
 pkgconfig>=1.5.1  # xmlsec build dep - needed for offline build
 django-flags>=5.0.13
 dispatcherd  # tasking system, previously part of AWX code base
+protobuf>=4.25.8 # CVE-2025-4565
+idna>=3.10 # CVE-2024-3651
+# Temporarily added to use ansible-runner from git branch, to be removed
+# when ansible-runner moves from requirements_git.txt to here
+pbr

requirements/requirements.txt

@@ -104,7 +104,7 @@ click==8.1.8
     # via receptorctl
 constantly==23.10.4
     # via twisted
-cryptography==41.0.7
+cryptography==42.0.8
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   adal
@@ -210,6 +210,7 @@ hyperlink==21.0.0
     #   twisted
 idna==3.10
     # via
+    #   -r /awx_devel/requirements/requirements.in
     #   hyperlink
     #   requests
     #   twisted
@@ -364,6 +365,11 @@ propcache==0.2.1
     #   yarl
 protobuf==5.29.3
     # via
+    #   aiohttp
+    #   yarl
+protobuf==4.25.8
+    # via
+    #   -r /awx_devel/requirements/requirements.in
     #   googleapis-common-protos
     #   opentelemetry-proto
 psutil==6.1.1
@@ -494,7 +500,6 @@ smmap==5.0.2
     # via gitdb
 sqlparse==0.5.3
     # via
-    #   -r /awx_devel/requirements/requirements.in
     #   django
     #   django-ansible-base
 tempora==5.8.0
@@ -523,6 +528,7 @@ typing-extensions==4.12.2
     #   twisted
 urllib3==2.3.0
     # via
+    #   -r /awx_devel/requirements/requirements.in
     #   botocore
     #   django-ansible-base
     #   kubernetes

requirements/requirements_git.credentials.txt

@@ -0,0 +1,2 @@
+# If sources in requirements_git.txt require authentication add git-credentials in this file, Example:
+# https://x-access-token:${PAT}@github.com"

requirements/requirements_git.txt

@@ -1,5 +1,11 @@
 git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
+<<<<<<< HEAD
 git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
 awx-plugins-core @ git+https://github.com/ansible/awx-plugins.git@devel#egg=awx-plugins-core[credentials-github-app]
 django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest-filters,jwt_consumer,resource-registry,rbac,feature-flags]
 awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git
+=======
+# Remove pbr from requirements.in when moving ansible-runner to requirements.in
+git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml
+django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest-filters,jwt_consumer,resource-registry,rbac,feature-flags]
+>>>>>>> tower/test_stable-2.6