diff --git a/Makefile b/Makefile index cd4f88c9..02607ac2 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ RECEPTOR_IMAGE ?= quay.io/ansible/receptor:devel SRC_ONLY_PKGS ?= cffi,pycparser,psycopg,twilio # These should be upgraded in the AWX and Ansible venv before attempting # to install the actual requirements -VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==83.0.0 setuptools_scm[toml]==9.2.2 wheel==0.48.0 +VENV_BOOTSTRAP ?= pip==26.2.1 setuptools==84.0.0 setuptools_scm[toml]==9.2.2 wheel==0.48.0 NAME ?= awx diff --git a/requirements/requirements.in b/requirements/requirements.in index c2c8d1de..0882b5ed 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -71,7 +71,7 @@ uWSGI>=2.0.22 # CVE-2023-27522 valkey[libvalkey] wheel>=0.46.2 # CVE-2026-24049 pip==26.2.1 # CVE-2026-13346 -setuptools==83.0.0 # CVE-2026-59890 +setuptools==84.0.0 # CVE-2026-59890 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 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3e9f203f..6f496d2b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -479,7 +479,7 @@ zope-interface==7.0.3 # The following packages are considered to be unsafe in a requirements file: pip==26.2.1 # via -r /awx_devel/requirements/requirements.in -setuptools==83.0.0 +setuptools==84.0.0 # via # -r /awx_devel/requirements/requirements.in # asciichartpy diff --git a/requirements/updater.sh b/requirements/updater.sh index 45ede2ff..04cc0581 100755 --- a/requirements/updater.sh +++ b/requirements/updater.sh @@ -23,7 +23,7 @@ generate_requirements() { source "${venv}/bin/activate" # pip / setuptools version must match the version used in AWX venv (see README.md UPGRADE BLOCKERs) - "${venv}/bin/python3" -m pip install -U 'pip==26.2.1' 'setuptools==83.0.0' pip-tools + "${venv}/bin/python3" -m pip install -U 'pip==26.2.1' 'setuptools==84.0.0' pip-tools ${pip_compile} ${input_reqs} --output-file requirements.txt # consider the git requirements for purposes of resolving deps