Merge develop into stable for v2025.12.05 release

saltbot-open · saltbot-open · commit 76cc780a00e7 · 2025-12-05T22:05:31.000Z
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,11 +1,14 @@
 ### Description of Issue/Question
 
 ### Setup
+
 (Please provide relevant configs (Be sure to remove sensitive info).)
 
 ### Steps to Reproduce Issue
+
 (Include debug logs if possible, `bootstrap-salt.sh -D`.)
 
 ### Versions and Systems
+
 (`salt --versions-report`, `bootstrap-salt.sh -v`, system type and version,
 cloud/VM provider as appropriate.)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,7 +3,9 @@
 ### What issues does this PR fix or reference?
 
 ### Previous Behavior
+
 Remove this section if not relevant
 
 ### New Behavior
+
 Remove this section if not relevant
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get specific changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v46
         with:
           separator: ","
           files: |
@@ -114,35 +114,35 @@ jobs:
 
 
 
-  macos-13:
-    name: macOS 13
+  macos-14:
+    name: macOS 14
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     uses: ./.github/workflows/test-macos.yml
     needs:
       - lint
       - generate-actions-workflow
     with:
-      distro-slug: macos-13
-      display-name: macOS 13
-      container-slug: macos-13
+      distro-slug: macos-14
+      display-name: macOS 14
+      container-slug: macos-14
       timeout: 20
-      runs-on: macos-13
+      runs-on: macos-14
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
-  macos-14:
-    name: macOS 14
+  macos-15-intel:
+    name: macOS 15 (intel)
     if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
     uses: ./.github/workflows/test-macos.yml
     needs:
       - lint
       - generate-actions-workflow
     with:
-      distro-slug: macos-14
-      display-name: macOS 14
-      container-slug: macOS 14
+      distro-slug: macos-15-intel
+      display-name: macOS 15 (intel)
+      container-slug: macos-15-intel
       timeout: 20
-      runs-on: macos-14
+      runs-on: macos-15-intel
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
@@ -163,6 +163,22 @@ jobs:
       instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
 
 
+  windows-2025:
+    name: Windows 2025
+    if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
+    uses: ./.github/workflows/test-windows.yml
+    needs:
+      - lint
+      - generate-actions-workflow
+    with:
+      distro-slug: windows-2025
+      display-name: Windows 2025
+      container-slug: windows-2025
+      timeout: 20
+      runs-on: windows-2025
+      instances: '["stable-3006", "stable-3006-8", "stable-3007", "stable-3007-1", "latest"]'
+
+
 
   amazonlinux-2023:
     name: Amazon 2023
@@ -277,9 +293,10 @@ jobs:
     needs:
       - lint
       - generate-actions-workflow
-      - macos-13
       - macos-14
+      - macos-15-intel
       - windows-2022
+      - windows-2025
       - amazonlinux-2023
       - debian-11
       - debian-12
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -163,8 +163,8 @@ jobs:
 
       - name: Update bootstrap-salt.sh sha256sum's
         run: |
-          sha256sum bootstrap-salt.sh | awk '{ print $1 }' > bootstrap-salt.sh.sha256
-          sha256sum bootstrap-salt.ps1 | awk '{ print $1 }' > bootstrap-salt.ps1.sha256
+          sha256sum bootstrap-salt.sh > bootstrap-salt.sh.sha256
+          sha256sum bootstrap-salt.ps1 > bootstrap-salt.ps1.sha256
           git commit -a -m "Update sha256 checksums" || git commit -a -m "Update sha256 checksums"
 
       - name: Push Changes
diff --git a/.github/workflows/scripts/update-release-shasum.py b/.github/workflows/scripts/update-release-shasum.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-import sys
 import pathlib
 import subprocess
+import sys
 
 THIS_FILE = pathlib.Path(__file__).resolve()
 CODE_ROOT = THIS_FILE.parent.parent.parent.parent
@@ -25,7 +25,7 @@ def main(version, sha256sum):
                 if not line.startswith("-"):
                     out_contents += line
                     continue
-                out_contents += "- {}: ``{}``\n".format(version, sha256sum)
+                out_contents += f"- {version}: ``{sha256sum}``\n"
                 out_contents += line
                 updated_version = True
                 continue
diff --git a/.github/workflows/templates/ci.yml b/.github/workflows/templates/ci.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Get specific changed files
         id: changed-files
-        uses: tj-actions/changed-files@v42
+        uses: tj-actions/changed-files@v46
         with:
           separator: ","
           files: |
diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python3
-import datetime
+"""
+To generate the workflows run the following:
+pre-commit run -av generate-actions-workflow
+"""
 import json
 import os
 import pathlib
@@ -24,11 +27,12 @@
 
 WINDOWS = [
     "windows-2022",
+    "windows-2025",
 ]
 
 OSX = [
-    "macos-13",
     "macos-14",
+    "macos-15-intel",
 ]
 
 #    "amazonlinux-2",
@@ -202,9 +206,10 @@
     "ubuntu-2004": "Ubuntu 20.04",
     "ubuntu-2204": "Ubuntu 22.04",
     "ubuntu-2404": "Ubuntu 24.04",
-    "macos-13": "macOS 13",
     "macos-14": "macOS 14",
+    "macos-15-intel": "macOS 15 (intel)",
     "windows-2022": "Windows 2022",
+    "windows-2025": "Windows 2025",
 }
 
 CONTAINER_SLUG_NAMES = {
@@ -221,9 +226,10 @@
     "ubuntu-2004": "ubuntu-20.04",
     "ubuntu-2204": "ubuntu-22.04",
     "ubuntu-2404": "ubuntu-24.04",
-    "macos-13": "macos-13",
-    "macos-14": "macOS 14",
+    "macos-14": "macos-14",
+    "macos-15-intel": "macos-15-intel",
     "windows-2022": "windows-2022",
+    "windows-2025": "windows-2025",
 }
 
 TIMEOUT_DEFAULT = 20
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -103,6 +103,7 @@ John Hubbard                ender8282              ender8282@gmail.com
 Jorge Schrauwen             sjorge                 sjorge@blackdot.be
 Joseph Pacura               jpacura
 Juan A. Moyano              wincus                 wincus.public@gmail.com
+Julian van Dijk             julian9499
 Justin Anderson             justinta               justin.ta@outlook.com
 Justin Findlay              jfindlay               jfindlay@gmail.com
                             kgbsd
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,34 @@
+# v2025.12.05
+
+## What's Changed
+
+- Remove hardware clock sync by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2085
+- Update deps that contain CVEs by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2086
+- replace the --global-option command with --config-settings since --global-option has been removed in pip 25.3 by @julian9499 in https://github.com/saltstack/salt-bootstrap/pull/2088
+- Include filename in shasum file by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2090
+- Update changelog and author to prep for release by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2092
+
+## New Contributors
+
+- @julian9499 made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2088
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2025.09.03...v2025.12.05
+
+# v2025.12.05
+
+## What's Changed
+
+- Include filename in the shasum file: https://github.com/saltstack/salt-bootstrap/pull/2090
+- Replace --global-option with --config-settings for pip: https://github.com/saltstack/salt-bootstrap/pull/2088
+- Update some dependencies that have CVEs: https://github.com/saltstack/salt-bootstrap/pull/2086
+- Remove hardware clock sync: https://github.com/saltstack/salt-bootstrap/pull/2085
+
+## New Contributors
+
+- @julian9499 made their first contribution in https://github.com/saltstack/salt-bootstrap/pull/2088
+
+  **Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2025.09.03...v2025.12.05
+
 # v2025.09.03
 
 ## What's Changed
@@ -7,6 +38,9 @@
 - Prep release by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2082
 - Add support for specifying a directory other than /tmp for installation execution by @edlitmus in https://github.com/saltstack/salt-bootstrap/pull/2068
 - Add another PR and a few more emails by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2083
+- Fixed installation on Photon 4 and Photon 5 by @erwindon in https://github.com/saltstack/salt-bootstrap/pull/2080
+- Properly handle 2 digit minor versions of Salt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2081
+- Added an option to specify something other than `/tmp` for installation execution by @edlitmus in https://github.com/saltstack/salt-bootstrap/pull/2068
 
 ## New Contributors
 
@@ -15,14 +49,6 @@
 
 **Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2025.02.24...v2025.09.03
 
-# v2025.09.03
-
-## What's Changed
-
-- Fixed installation on Photon 4 and Photon 5 by @erwindon in https://github.com/saltstack/salt-bootstrap/pull/2080
-- Properly handle 2 digit minor versions of Salt by @twangboy in https://github.com/saltstack/salt-bootstrap/pull/2081
-- Added an option to specify something other than `/tmp` for installation execution by @edlitmus in https://github.com/saltstack/salt-bootstrap/pull/2068
-
 # v2025.02.24
 
 ## What's Changed
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
 
 Examples of behavior that contributes to creating a positive environment include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
 
 ## Our Responsibilities
 
diff --git a/README.rst b/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.09.03: ``972d6e1a3592a8c2c820a5927e530be3c9b76de00e0a2a7126aec3f73ce99e6c``
 - 2025.02.24: ``a0e3a58fc6358a7c6f708ee4910229e72fbdab7161819514b0696146a2edb62d``
 - 2024.12.12: ``7cc91adfa5a15ff57d203dc2b79608c773efc639d4e9bf03861198903e11becd``
 - 2024.12.09: ``44f9405a6d9622ad8fa7c93e83a52e01ca328f27e4e9dea4a52268c6a22dbe6d``
diff --git a/bootstrap-salt.ps1 b/bootstrap-salt.ps1
@@ -108,7 +108,7 @@ if ($help) {
     exit 0
 }
 
-$__ScriptVersion = "2025.09.03"
+$__ScriptVersion = "2025.12.05"
 $ScriptName = $myInvocation.MyCommand.Name
 
 # We'll check for the Version next, because it also has no requirements
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
@@ -26,7 +26,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2025.09.03"
+__ScriptVersion="2025.12.05"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"
@@ -1952,11 +1952,6 @@ __wait_for_apt(){
     # Timeout set at 15 minutes
     WAIT_TIMEOUT=900
 
-    ## see if sync'ing the clocks helps
-    if [ -f /usr/sbin/hwclock ]; then
-        /usr/sbin/hwclock -s
-    fi
-
     # Run our passed in apt command
     "${@}" 2>"$APT_ERR"
     APT_RETURN=$?
@@ -2826,11 +2821,11 @@ __install_salt_from_repo() {
 
     echodebug "Running '${_pip_cmd} install ${_USE_BREAK_SYSTEM_PACKAGES} --no-deps --force-reinstall ${_PIP_INSTALL_ARGS} ${_TMP_DIR}/git/deps/salt*.whl'"
 
-    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"
+    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} \
-        --global-option="--salt-config-dir=$_SALT_ETC_DIR --salt-cache-dir=${_SALT_CACHE_DIR} ${SETUP_PY_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
 
     echoinfo "Checking if Salt can be imported using ${_py_exe}"
diff --git a/requirements/release.in b/requirements/release.in
@@ -1,3 +1,5 @@
 pre-commit
 python-tools-scripts >= 0.18.6
 boto3
+requests >= 2.32.5
+urllib3 >= 2.5.0
diff --git a/requirements/release.txt b/requirements/release.txt
@@ -56,8 +56,10 @@ python-tools-scripts==0.20.5
     # via -r requirements/release.in
 pyyaml==6.0.2
     # via pre-commit
-requests==2.32.3
-    # via python-tools-scripts
+requests==2.32.5
+    # via
+    #   -r requirements/release.in
+    #   python-tools-scripts
 rich==13.9.4
     # via python-tools-scripts
 s3transfer==0.10.4
@@ -70,8 +72,9 @@ typing-extensions==4.12.2
     #   pydantic-core
     #   python-tools-scripts
     #   rich
-urllib3==2.3.0
+urllib3==2.5.0
     # via
+    #   -r requirements/release.in
     #   botocore
     #   requests
 virtualenv==20.28.1
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,9 +1,9 @@
 import json
 import os
-import requests
-from packaging.version import Version
 
 import pytest
+import requests
+from packaging.version import Version
 
 API_URL = (
     "https://packages.broadcom.com/artifactory/api/storage/saltproject-generic/windows"
diff --git a/tools/pre_commit.py b/tools/pre_commit.py
diff --git a/tools/release.py b/tools/release.py

-Original file line number
+Diff line change
 Jorge Schrauwen             sjorge                 [email protected]
 Joseph Pacura               jpacura
 Juan A. Moyano              wincus                 [email protected]
 +Julian van Dijk             julian9499
 Justin Anderson             justinta               [email protected]
 Justin Findlay              jfindlay               [email protected]
                             kgbsd