Merge develop into stable for v2026.01.15 release

Author: saltbot-open

.github/workflows/ci.yml

@@ -207,7 +207,7 @@ jobs:
       display-name: Debian 11
       container-slug: debian-11
       timeout: 20
-      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
+      instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
 
 
   debian-12:

.github/workflows/templates/generate.py

@@ -125,7 +125,6 @@
 BLACKLIST_GIT_MASTER = [
     "amazonlinux-2",
     "amazonlinux-2023",
-    "debian-11",
     "debian-13",
     "fedora-40",
     "photon-4",

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 minimum_pre_commit_version: 1.15.2
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: trailing-whitespace   # Trims trailing whitespace.
@@ -12,12 +12,12 @@ repos:
       - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: 1.0.0
     hooks:
       - id: mdformat
 
   - repo: https://github.com/s0undt3ch/python-tools-scripts
-    rev: "0.18.6"
+    rev: "0.20.5"
     hooks:
       - id: tools
         alias: actionlint
@@ -30,15 +30,15 @@ repos:
           - actionlint
 
   - repo: https://github.com/jazzband/pip-tools
-    rev: 7.4.1
+    rev: v7.5.2
     hooks:
       - id: pip-compile
         files: ^requirements/release\.(in|txt)$
         args:
           - requirements/release.in
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
         name: Rewrite Code to be Py3.6+
@@ -47,13 +47,13 @@ repos:
         ## DGM args: [--py39-plus]
 
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.12.0
+    rev: v3.16.0
     hooks:
       - id: reorder-python-imports
         args: [--py310-plus]
 
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.12.0
     hooks:
       - id: black
         args: []

CHANGELOG.md

@@ -1,3 +1,19 @@
+# v2026.01.15
+
+## What's Changed
+
+- Update urllib3 to 2.6.0 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2093
+- Update filelock to v3.20.1 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2098
+- Update urllib3=2.6.3 and virtualenv=20.36.1 by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2099
+- fix: reinstate the old method of setting `pip` global options by @dafyddj in https://github.com/saltstack/salt-bootstrap/pull/2100
+- Fixes #2094 by changing reference to script var BS_TMP_DIR to \_TMP_DIR in help message text. by @jsbiff in https://github.com/saltstack/salt-bootstrap/pull/2097
+
+## New Contributors
+
+- @jsbiff made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2097
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2025.12.05...v2026.01.15
+
 # v2025.12.05
 
 ## What's Changed
@@ -128,7 +144,7 @@
 
 - Make universal repo url by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2045
 - Update bootstrap shell CI/CD to utilize containers and clean up by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2039
-- \[WIP\] hwclock check missing additional condition on major version by @ruslantum in https://github.com/saltstack/salt-bootstrap/pull/2048
+- [WIP] hwclock check missing additional condition on major version by @ruslantum in https://github.com/saltstack/salt-bootstrap/pull/2048
 
 ## New Contributors
 
@@ -210,7 +226,7 @@
 
 ## What's Changed
 
-- Updated README, and removed experimental  to ability install different Python version which was limited to RHEL 7, which is EOL by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2009
+- Updated README, and removed experimental to ability install different Python version which was limited to RHEL 7, which is EOL by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2009
 
 **Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2024.07.16...v2024.07.18
 
@@ -220,7 +236,7 @@
 
 - Update bootstrap-salt.sh by @javatask in https://github.com/saltstack/salt-bootstrap/pull/2005
 - Updated GitHub actions to later v4 by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2004
-- Don't sort lists and dicts, as order of items matters  by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2006
+- Don't sort lists and dicts, as order of items matters by @dmurphy18 in https://github.com/saltstack/salt-bootstrap/pull/2006
 
 ## New Contributors
 
@@ -378,7 +394,7 @@
 - Debian ARM Fix by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1887
 - Added Pop!\_OS as a Ubuntu derivative by @shombando in https://github.com/saltstack/salt-bootstrap/pull/1888
 - Don't attempt to stable install on Red Hat onedir only systems by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1889
-- \[docs\] Improve Windows readme instructions and links in script by @dafyddj in https://github.com/saltstack/salt-bootstrap/pull/1897
+- [docs] Improve Windows readme instructions and links in script by @dafyddj in https://github.com/saltstack/salt-bootstrap/pull/1897
 - Adding newer versions of CentOS Stream and AlmaLinux by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1890
 - Add support for KDE neon based on Ubuntu 22.04 by @digitalkram in https://github.com/saltstack/salt-bootstrap/pull/1894
 - Removing Ubuntu 16.04 by @garethgreenaway in https://github.com/saltstack/salt-bootstrap/pull/1886
@@ -529,7 +545,7 @@
 - Add support for Ubuntu 20.04 (bryceml) #1479
 - Default Ubuntu 20.04 to Py3 since there isn't a Py2 release for it (bryceml) #1480
 - Warn instead of exit when using -R and -x python3 on centos to allow installing python3
-  versions of salt on centos from other repos.  Old unsupported releases probably need to
+  versions of salt on centos from other repos. Old unsupported releases probably need to
   manually install epel-release before running the bootstrap script for versions before 2018.3.5
   and before 2019.2.1 (bryceml) #1482
 - Start maintaining .sha256 files for the bootstrap script
@@ -560,8 +576,8 @@
 # v2020.02.04:
 
 - Add support for the Salt Neon(3000) release (s0undt3ch) #1424
-- Drop support for Fedora \< 30 (s0undt3ch) #1424
-- Drop support for Debian \< 8 (s0undt3ch) #1424
+- Drop support for Fedora < 30 (s0undt3ch) #1424
+- Drop support for Debian < 8 (s0undt3ch) #1424
 
 # v2020.01.29:
 
@@ -625,7 +641,7 @@
 - Fedora Py3 fixes (The-Loeki) #1273
 - Handle commented lines in the requirements files for pip pkgs (rallytime) #1271
 - Remove typo: extra 'c' was accidentally added in #1269 (rallytime) #1270
-- \[Arch\] Add python2-futures to list of pkgs on git install (rallytime) #1269
+- [Arch] Add python2-futures to list of pkgs on git install (rallytime) #1269
 - Fix undefined variable warn_msg on amd64 (alexandruavadanii) #1268
 - SLES12SP changed packages git to git-core and libzmq3 to libzmq4 (mfapouw) #1266
 - Add opensuse 15 specific installation functions (rallytime) #1263
@@ -756,8 +772,8 @@
 - Shallow cloning and Python setup fix for BSD (amontalban) #1040
 - Fix not needed quoting for salt/salt-bootstrap#1026 (amontalban) #1039
 - Update README file with supported release documentation (rallytime) #1034
-- Remove \<\<\< bashism (The-Loeki) #1032
-- \[-R option\] Fix logic error where we trying to enable epel with -R (rallytime) #1033
+- Remove \<<< bashism (The-Loeki) #1032
+- [-R option] Fix logic error where we trying to enable epel with -R (rallytime) #1033
 - Alpine: check Salt services have been enabled to start on boot (vutny) #1031
 - AWS Linux Native Support (bkruger99) #1022
 - Correct package name for FreeBSD installation (amontalban) #1030
@@ -812,7 +828,7 @@
 - Add python-futures package to install_centos_git_deps (rallytime) #948
 - Add /etc/portage/package.accept_keywords to CONFIG_PROTECT_MASK (rallytime) #947
 - Deprecate `-G` option: use `https` scheme for GitHub by default (vutny) #945
-- \[SECURITY\] Properly handle GnuPG keys for APT repositories (vutny) #940
+- [SECURITY] Properly handle GnuPG keys for APT repositories (vutny) #940
 
 # v2016.08.16:
 
@@ -881,7 +897,7 @@
 # v2016.04.18:
 
 - Add support for openSUSE Leap. Thanks Roman Inflianskas(rominf). #693
-- Fix missing deps installation on Debian. Thanks  Steve Groesz(wolfpackmars2). #699
+- Fix missing deps installation on Debian. Thanks Steve Groesz(wolfpackmars2). #699
 - Update SaltStack repo location and latest version for Windows. (brandon099) #711
 - Better EPEL repository detection on RHEL and CentOS. (vutny) #717
 - Fix git invocation fail when `man` command is not available. (vutny) #718
@@ -951,7 +967,7 @@
 # v2015.08.06:
 
 - Fix python-requests installations for Ubuntu >= 14.04 LTS. #631, #632, #633
-- Install python-crypto from Chris Lea's PPA for Ubuntu \< 14.04
+- Install python-crypto from Chris Lea's PPA for Ubuntu < 14.04
 - Exit the git checkout directory before deleting it. Thanks Bret Fisher. #634
 - Use prefix /usr for centos git install. Thanks Stanislav B. #638
 - Drop Ubuntu EOL versions. All Ubuntu version before 12.04.
@@ -1249,7 +1265,7 @@
 # v1.5.9:
 
 - Allow to not start the daemons after bootstrapping salt. This will allow `vagrant-lxc`
-  installations,  `debootstrap*`, etc, to finish properly. Thanks Henrik Holmboe (holmboe).
+  installations, `debootstrap*`, etc, to finish properly. Thanks Henrik Holmboe (holmboe).
 - Distro Support Fixed:
 - Salt >= 0.17 requires ElementTree which is on the python standard library after python
   2.6 but openSUSE split that into a separate package.
@@ -1269,7 +1285,7 @@
   and RedHat based distributions support system upgrades).
 - Fixed an issue where passing BS_KEEP_TEMP_FILES=1 to the script was causing an error. #206.
 - Switched FreeBSD default packages repository to PCBSD(http://www.pcbsd.org) and added
-  multiple repository support to install salt from the SaltStack's FreeBSD repository.  Thanks
+  multiple repository support to install salt from the SaltStack's FreeBSD repository. Thanks
   Christer Edwards(cedwards).
 - Improved Gentoo Support. Thanks Elias Probst(eliasp).
 - Stop execution soon for end of life distributions or non supported distribution versions.

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:
 
+- 2025.12.05: ``52034f69df84291928075264a0de75e2f9f202a28a5b3a0a82252bd12458a67d``
 - 2025.09.03: ``972d6e1a3592a8c2c820a5927e530be3c9b76de00e0a2a7126aec3f73ce99e6c``
 - 2025.02.24: ``a0e3a58fc6358a7c6f708ee4910229e72fbdab7161819514b0696146a2edb62d``
 - 2024.12.12: ``7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd``

bootstrap-salt.ps1

@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2025.12.05"
+$__ScriptVersion = "2026.01.15"
 $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="2025.12.05"
+__ScriptVersion="2026.01.15"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -369,7 +369,7 @@ __usage() {
         also be specified. Salt installation will be ommitted, but some of the
         dependencies could be installed to write configuration with -j or -J.
     -d  Disables checking if Salt services are enabled to start on system boot.
-        You can also do this by touching ${BS_TMP_DIR}/disable_salt_checks on the target
+        You can also do this by touching ${_TMP_DIR}/disable_salt_checks on the target
         host. Default: \${BS_FALSE}
     -D  Show debug output
     -f  Force shallow cloning for git installations.
@@ -2819,14 +2819,25 @@ __install_salt_from_repo() {
         ${_pip_cmd} install --force-reinstall --break-system-packages "${_arch_dep}"
     fi
 
-    echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} ${_TMP_DIR}/git/deps/salt*.whl'"
+    _PIP_VERSION_STRING=$(${_pip_cmd} --version)
+    echodebug "Installed pip version: $_PIP_VERSION_STRING"
+    _PIP_MAJOR_VERSION=$(echo "$_PIP_VERSION_STRING" | sed -E 's/^pip ([0-9]+)\..*/\1/')
 
-    echodebug "Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --config-settings=--global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} ${_TMP_DIR}/git/deps/salt*.whl"
-
-    ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
-        ${_PIP_INSTALL_ARGS} \
-        --config-settings="--global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS}" \
-        ${_TMP_DIR}/git/deps/salt*.whl || return 1
+    # The following branching can be removed once we no longer support distros that still ship with
+    # versions of `pip` earlier than v22.1 such as Debian 11
+    if [ "$_PIP_MAJOR_VERSION" -lt 23 ]; then
+        echodebug "Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} ${_TMP_DIR}/git/deps/salt*.whl"
+        ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
+            ${_PIP_INSTALL_ARGS} \
+            --global-option="--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS}" \
+            ${_TMP_DIR}/git/deps/salt*.whl || return 1
+    else
+        echodebug "Running ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} --config-settings=--global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS} ${_TMP_DIR}/git/deps/salt*.whl"
+        ${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall \
+            ${_PIP_INSTALL_ARGS} \
+            --config-settings="--global-option=--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_INSTALL_ARGS}" \
+            ${_TMP_DIR}/git/deps/salt*.whl || return 1
+    fi
 
     echoinfo "Checking if Salt can be imported using ${_py_exe}"
     CHECK_SALT_SCRIPT=$(cat << EOM

requirements/release.in

@@ -1,5 +1,7 @@
+boto3
+filelock >= 3.20.1
 pre-commit
 python-tools-scripts >= 0.18.6
-boto3
 requests >= 2.32.5
-urllib3 >= 2.5.0
+urllib3 >= 2.6.3
+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
@@ -22,8 +22,9 @@ charset-normalizer==3.4.1
     # via requests
 distlib==0.3.9
     # via virtualenv
-filelock==3.16.1
+filelock==3.20.2
     # via
+    #   -r requirements/release.in
     #   python-tools-scripts
     #   virtualenv
 identify==2.6.5
@@ -70,12 +71,12 @@ typing-extensions==4.12.2
     # via
     #   pydantic
     #   pydantic-core
-    #   python-tools-scripts
-    #   rich
-urllib3==2.5.0
+urllib3==2.6.3
     # via
     #   -r requirements/release.in
     #   botocore
     #   requests
-virtualenv==20.28.1
-    # via pre-commit
+virtualenv==20.36.1
+    # via
+    #   -r requirements/release.in
+    #   pre-commit