Merge develop into stable for v2026.05.20 release

Author: saltbot-open

CHANGELOG.md

@@ -1,3 +1,13 @@
+# v2026.05.20
+
+## What's Changed
+
+- Update urllib3 to 2.7.0 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2110
+- Update idna to >= 3.15 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2111
+- fix(bootstrap): install git deps from linux.lock or linux.txt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2112
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2026.05.01...v2026.05.20
+
 # v2026.05.01
 
 ## What's Changed

README.rst

@@ -37,6 +37,7 @@ sum** of the downloaded ``bootstrap-salt.sh`` file.
 
 The SHA256 sum of the ``bootstrap-salt.sh`` file, per release, is:
 
+- 2026.05.01: ``891255f1072c88dc0a03c697533b9be9b5d606e32c129ba802aeb10d0713ee8b``
 - 2026.01.22: ``7f082e79f8b58ce6c214f847878814d362eb6ffe15e894d069bff46ba3141c83``
 - 2026.01.15: ``778ee0126f7477652bac41fccf361663faec37123703d52f5fd9e7b76a7c2174``
 - 2025.12.05: ``52034f69df84291928075264a0de75e2f9f202a28a5b3a0a82252bd12458a67d``

bootstrap-salt.ps1

@@ -112,7 +112,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2026.05.01"
+$__ScriptVersion = "2026.05.20"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements

bootstrap-salt.sh

@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2026.05.01"
+__ScriptVersion="2026.05.20"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -2785,8 +2785,18 @@ __install_salt_from_repo() {
 
     rm -f ${_TMP_DIR}/git/deps/*
 
-    echodebug "Installing Salt requirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r requirements/static/ci/py${_py_version}/linux.txt"
-    ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "requirements/static/ci/py${_py_version}/linux.txt"
+    _salt_static_ci_linux_req=""
+    if [ -f "requirements/static/ci/py${_py_version}/linux.lock" ]; then
+        _salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.lock"
+    elif [ -f "requirements/static/ci/py${_py_version}/linux.txt" ]; then
+        _salt_static_ci_linux_req="requirements/static/ci/py${_py_version}/linux.txt"
+    else
+        echoerror "Salt static CI requirements not found: expected requirements/static/ci/py${_py_version}/linux.lock or requirements/static/ci/py${_py_version}/linux.txt"
+        return 1
+    fi
+
+    echodebug "Installing Salt requirements from PyPi, ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r ${_salt_static_ci_linux_req}"
+    ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --ignore-installed ${_PIP_INSTALL_ARGS} -r "${_salt_static_ci_linux_req}"
     # shellcheck disable=SC2181
     if [ $? -ne 0 ]; then
         echo "Failed to install salt requirements for the version of Python ${_py_version}"

requirements/release.in

@@ -1,8 +1,9 @@
 boto3
 filelock >= 3.20.3
+idna >= 3.15
 pre-commit
 pygments >= 2.20.0
 python-tools-scripts >= 0.18.6
-requests >= 2.33.0
-urllib3 >= 2.6.3
+requests >= 2.34.2
+urllib3 >= 2.7.0
 virtualenv >= 20.36.1

requirements/release.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements/release.in
@@ -29,8 +29,10 @@ filelock==3.20.3
     #   virtualenv
 identify==2.6.5
     # via pre-commit
-idna==3.10
-    # via requests
+idna==3.15
+    # via
+    #   -r requirements/release.in
+    #   requests
 jmespath==1.0.1
     # via
     #   boto3
@@ -59,7 +61,7 @@ python-tools-scripts==0.20.5
     # via -r requirements/release.in
 pyyaml==6.0.2
     # via pre-commit
-requests==2.33.1
+requests==2.34.2
     # via
     #   -r requirements/release.in
     #   python-tools-scripts
@@ -73,10 +75,7 @@ typing-extensions==4.15.0
     # via
     #   pydantic
     #   pydantic-core
-    #   python-tools-scripts
-    #   rich
-    #   virtualenv
-urllib3==2.6.3
+urllib3==2.7.0
     # via
     #   -r requirements/release.in
     #   botocore