Bump python version to 3.12

.github/workflows/ci.yml

@@ -470,7 +470,7 @@ jobs:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -487,7 +487,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -504,7 +504,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -519,10 +519,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -539,7 +539,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -557,7 +557,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
       workflow-slug: ci
       default-timeout: 180

.github/workflows/nightly.yml

@@ -465,7 +465,7 @@ jobs:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -482,7 +482,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -503,7 +503,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -522,10 +522,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -542,7 +542,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -560,7 +560,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       workflow-slug: nightly
       default-timeout: 360

.github/workflows/scheduled.yml

@@ -513,7 +513,7 @@ jobs:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -530,7 +530,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -547,7 +547,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -562,10 +562,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -582,7 +582,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -600,7 +600,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       workflow-slug: scheduled
       default-timeout: 360

.github/workflows/staging.yml

@@ -497,7 +497,7 @@ jobs:
       cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -515,7 +515,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "onedir"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -537,7 +537,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
       relenv-version: "0.22.4"
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       source: "src"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
@@ -556,10 +556,10 @@ jobs:
     with:
       nox-session: ci-test-onedir
       nox-version: 2022.8.7
-      python-version: "3.11.14"
+      python-version: "3.12.12"
       ci-python-version: "3.11"
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
       linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
@@ -576,7 +576,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       nox-version: 2022.8.7
       ci-python-version: "3.11"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
@@ -594,7 +594,7 @@ jobs:
       ci-python-version: "3.11"
       testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
       skip-code-coverage: true
       workflow-slug: staging
       default-timeout: 180

.gitignore

@@ -155,3 +155,7 @@ nox.*.tar.xz
 /.aiderignore
 /aider.conf.yml
 /.gemini
+venv310/
+venv312/
+*.json
+*.txt

cicd/shared-gh-workflows-context.yml

@@ -3,7 +3,7 @@
 
 # Tool versions
 nox_version: "2022.8.7"
-python_version: "3.11.14"
+python_version: "3.12.12"
 relenv_version: "0.22.4"
 release_branches:
   - "3006.x"

noxfile.py

@@ -85,7 +85,7 @@
 else:
     ONEDIR_PYTHON_PATH = ONEDIR_ARTIFACT_PATH / "bin" / "python3"
 # Python versions to run against
-_PYTHON_VERSIONS = ("3", "3.8", "3.9", "3.10", "3.11")
+_PYTHON_VERSIONS = ("3", "3.8", "3.9", "3.10", "3.11", "3.12")
 
 # Nox options
 #  Reuse existing virtualenvs

pkg/macos/install_salt.sh

@@ -127,7 +127,7 @@ fi
 # Install Requirements into the Python Environment
 #-------------------------------------------------------------------------------
 _msg "Installing Salt requirements"
-$PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
+CFLAGS="${CFLAGS} -Wno-int-conversion" $PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
 if [ -f "$BUILD_DIR/bin/distro" ]; then
     _success
 else

requirements/static/ci/common.in

@@ -24,6 +24,7 @@ google-auth==2.35.0; python_version == '3.9'
 jmespath>=1.1.0
 jsonschema
 junos-eznc; sys_platform != 'win32'
+ncclient>=0.6.16; sys_platform != 'win32'
 junit-xml>=1.9
 jxmlease; sys_platform != 'win32'
 kazoo; sys_platform != 'win32' and sys_platform != 'darwin'

requirements/static/ci/darwin.in

@@ -1,6 +1,6 @@
-pygit2>=1.10.1
+pygit2>=1.14.0
 yamllint
-mercurial
+mercurial>=6.7
 hglib
 # Pin versions to match 3007.x
 apache-libcloud>=3.8.0

requirements/static/ci/freebsd.in

@@ -1,5 +1,5 @@
 # FreeBSD static CI requirements
 
 yamllint
-mercurial
+mercurial>=6.7
 hglib

requirements/static/ci/linux.in

@@ -1,6 +1,6 @@
 # Linux static CI requirements
 pyiface
-pygit2>=1.10.1
+pygit2>=1.14.0
 pymysql>=1.1.1
 ansible>=10.7.0; python_version >= '3.10' and python_version < '3.11'
 ansible>=12.3.0; python_version >= '3.11' and python_version < '3.12'
@@ -10,7 +10,7 @@ ansible>=4.4.0,<5.0.1; python_version < '3.9'
 twilio
 python-telegram-bot>=13.7
 yamllint
-mercurial
+mercurial>=6.7
 hglib
 redis-py-cluster
 python-consul

requirements/static/ci/py3.10/cloud.txt

@@ -231,6 +231,10 @@ iniconfig==2.0.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   pytest
+invoke==2.2.1
+    # via
+    #   -c requirements/static/ci/py3.10/linux.txt
+    #   paramiko
 jaraco-collections==4.1.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
@@ -279,7 +283,7 @@ junit-xml==1.9
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/static/ci/common.in
-junos-eznc==2.6.7
+junos-eznc==2.7.6
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/static/ci/common.in
@@ -308,7 +312,7 @@ looseversion==1.3.0
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -c requirements/static/pkg/py3.10/linux.txt
     #   -r requirements/base.txt
-lxml==4.9.2
+lxml==6.0.2
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   junos-eznc
@@ -351,21 +355,19 @@ msgpack==1.0.7
     #   -c requirements/static/pkg/py3.10/linux.txt
     #   -r requirements/base.txt
     #   pytest-salt-factories
-multidict==6.7.1
+multidict==6.1.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -c requirements/static/pkg/py3.10/linux.txt
     #   aiohttp
     #   yarl
-ncclient==0.6.13
+ncclient==0.7.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
+    #   -r requirements/static/ci/common.in
     #   junos-eznc
 netaddr==0.8.0
-    # via
-    #   -c requirements/static/ci/py3.10/linux.txt
-    #   -r requirements/static/ci/cloud.in
-    #   junos-eznc
+    # via -r requirements/static/ci/cloud.in
 oauthlib==3.3.1
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
@@ -380,7 +382,7 @@ packaging==24.0
     #   -c requirements/static/pkg/py3.10/linux.txt
     #   -r requirements/base.txt
     #   pytest
-paramiko==3.4.0
+paramiko==4.0.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   -r requirements/static/ci/common.in
@@ -580,7 +582,7 @@ pyyaml==6.0.1
     #   kubernetes
     #   pytest-salt-factories
     #   responses
-    #   yamlordereddictloader
+    #   yamlloader
 pyzmq==25.1.2
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
@@ -653,7 +655,6 @@ six==1.16.0
     #   junos-eznc
     #   kazoo
     #   kubernetes
-    #   ncclient
     #   profitbricks
     #   python-dateutil
     #   pyvmomi
@@ -783,7 +784,7 @@ xmltodict==0.13.0
     #   -c requirements/static/ci/py3.10/linux.txt
     #   moto
     #   pywinrm
-yamlordereddictloader==0.4.0
+yamlloader==1.6.0
     # via
     #   -c requirements/static/ci/py3.10/linux.txt
     #   junos-eznc