From 8e50f91d01b1b6d0db042a538bf8967102d2fa8c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 5 Jul 2025 01:22:56 -0700 Subject: [PATCH 01/58] Upgrade urllib3 to > 2.0 --- requirements/base.txt | 3 ++- requirements/static/ci/common.in | 8 ++++---- requirements/static/ci/py3.10/cloud.txt | 17 ++++++++--------- requirements/static/ci/py3.10/darwin.txt | 17 ++++++++--------- requirements/static/ci/py3.10/docs.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 17 ++++++++--------- requirements/static/ci/py3.10/lint.txt | 17 ++++++++--------- requirements/static/ci/py3.10/linux.txt | 17 ++++++++--------- requirements/static/ci/py3.10/windows.txt | 17 ++++++++--------- requirements/static/ci/py3.11/cloud.txt | 17 ++++++++--------- requirements/static/ci/py3.11/darwin.txt | 17 ++++++++--------- requirements/static/ci/py3.11/docs.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 17 ++++++++--------- requirements/static/ci/py3.11/lint.txt | 17 ++++++++--------- requirements/static/ci/py3.11/linux.txt | 17 ++++++++--------- requirements/static/ci/py3.11/windows.txt | 17 ++++++++--------- requirements/static/ci/py3.12/cloud.txt | 17 ++++++++--------- requirements/static/ci/py3.12/darwin.txt | 17 ++++++++--------- requirements/static/ci/py3.12/docs.txt | 2 +- requirements/static/ci/py3.12/freebsd.txt | 17 ++++++++--------- requirements/static/ci/py3.12/lint.txt | 17 ++++++++--------- requirements/static/ci/py3.12/linux.txt | 17 ++++++++--------- requirements/static/ci/py3.12/windows.txt | 17 ++++++++--------- requirements/static/ci/py3.9/cloud.txt | 17 ++++++++--------- requirements/static/ci/py3.9/darwin.txt | 17 ++++++++--------- requirements/static/ci/py3.9/docs.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 17 ++++++++--------- requirements/static/ci/py3.9/lint.txt | 17 ++++++++--------- requirements/static/ci/py3.9/linux.txt | 17 ++++++++--------- requirements/static/ci/py3.9/windows.txt | 17 ++++++++--------- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.12/darwin.txt | 2 +- requirements/static/pkg/py3.12/freebsd.txt | 2 +- requirements/static/pkg/py3.12/linux.txt | 2 +- requirements/static/pkg/py3.12/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- requirements/windows.txt | 3 ++- 47 files changed, 220 insertions(+), 242 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c28d0dfddd2d..139accc53d23 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,4 +18,5 @@ croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' # We need contextvars for salt-ssh contextvars cryptography>=42.0.0 -urllib3>=1.26.20,<2.0.0 +urllib3>=1.26.20,<2.0.0; python_version < '3.10' +urllib3>=2.5.0; python_version >= '3.10' diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 7611baf73738..39b16b2e6560 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -4,8 +4,8 @@ --constraint=../pkg/py{py_version}/{platform}.txt apache-libcloud>=1.5.0; sys_platform != 'win32' -boto3>=1.17.67 -boto>=2.46.0 +boto3>=1.25.0 +boto>=2.47.0 cassandra-driver>=2.0 cffi>=1.14.6 cherrypy>=17.4.1 @@ -19,9 +19,9 @@ junos-eznc; sys_platform != 'win32' and python_version <= '3.10' jxmlease; sys_platform != 'win32' kazoo; sys_platform != 'win32' and sys_platform != 'darwin' keyring==5.7.1 -kubernetes<4.0 +kubernetes<4.0.0 libnacl>=1.7.1; sys_platform != 'win32' and sys_platform != 'darwin' -moto>=2.0.0 +moto>=5.0.0 # Napalm pulls in pyeapi which does not work on Py3.10 napalm; sys_platform != 'win32' and python_version < '3.10' paramiko>=2.10.1; sys_platform != 'win32' and sys_platform != 'darwin' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index bc6e9d990b5b..93d0e1745776 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -44,7 +44,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in @@ -53,7 +53,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.10/linux.txt # boto3 @@ -314,7 +314,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via @@ -329,7 +328,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in @@ -539,7 +538,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via @@ -556,6 +554,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # pytest-salt-factories + # responses # yamlordereddictloader pyzmq==23.2.0 # via @@ -581,7 +580,7 @@ requests==2.32.3 ; python_version >= "3.10" # requests-ntlm # responses # vcert -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.10/linux.txt # moto @@ -598,7 +597,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.10/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.10/linux.txt # boto3 @@ -635,7 +634,6 @@ six==1.16.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # transitions # vcert @@ -691,7 +689,7 @@ typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.10/linux.txt # pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt @@ -701,6 +699,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index f939ab713b34..751cd85917d6 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -33,13 +33,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -225,7 +225,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in @@ -239,7 +238,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -381,7 +380,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -393,6 +391,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==25.1.2 ; sys_platform == "darwin" @@ -413,13 +412,13 @@ requests==2.32.3 ; python_version >= "3.10" # responses # vcert # vultr -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via junos-eznc @@ -443,7 +442,6 @@ six==1.16.0 # ncclient # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -477,7 +475,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.2.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt @@ -486,6 +484,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index a8ad83cc92cf..79f7aa6ddfca 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -206,7 +206,7 @@ typing-extensions==4.8.0 # myst-docutils uc-micro-py==1.0.1 # via linkify-it-py -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 11590cee2f5d..7cd7cb0d662d 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -30,13 +30,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -218,7 +218,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in @@ -232,7 +231,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -375,7 +374,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -387,6 +385,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -406,13 +405,13 @@ requests==2.32.3 ; python_version >= "3.10" # pyvmomi # responses # vcert -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via junos-eznc @@ -438,7 +437,6 @@ six==1.16.0 # ncclient # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -470,7 +468,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.8.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt @@ -479,6 +477,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 3aed7ea69b14..201bc0a603e3 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -53,7 +53,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in @@ -62,7 +62,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.10/linux.txt # boto3 @@ -318,7 +318,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mccabe==0.6.1 # via pylint @@ -334,7 +333,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in @@ -501,7 +500,6 @@ pytz==2022.1 # -c requirements/static/ci/py3.10/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -518,6 +516,7 @@ pyyaml==6.0.1 # clustershell # junos-eznc # kubernetes + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -552,7 +551,7 @@ resolvelib==0.5.4 # via # -c requirements/static/ci/py3.10/linux.txt # ansible-core -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.10/linux.txt # moto @@ -569,7 +568,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.10/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.10/linux.txt # boto3 @@ -607,7 +606,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -678,7 +676,7 @@ tzlocal==3.0 # via # -c requirements/static/ci/py3.10/linux.txt # apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt @@ -688,6 +686,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index d49ebf00be37..5c91853c1d64 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -36,13 +36,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -228,7 +228,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in @@ -242,7 +241,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -397,7 +396,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.10/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -412,6 +410,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -439,7 +438,7 @@ requests==2.32.3 ; python_version >= "3.10" # vcert resolvelib==0.5.4 # via ansible-core -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in @@ -449,7 +448,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via junos-eznc @@ -477,7 +476,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -519,7 +517,7 @@ typing-extensions==4.8.0 # via pytest-system-statistics tzlocal==3.0 # via apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt @@ -528,6 +526,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index ea4788f5ae85..c19f1c452c9f 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -20,13 +20,13 @@ attrs==23.1.0 # pytest-system-statistics bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -207,7 +207,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via -r requirements/pytest.txt @@ -219,7 +218,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -353,7 +352,6 @@ pythonnet==3.0.1 pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -373,6 +371,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via @@ -394,13 +393,13 @@ requests==2.32.3 ; python_version >= "3.10" # pywinrm # requests-ntlm # responses -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in @@ -423,7 +422,6 @@ six==1.15.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # websocket-client smmap==4.0.0 @@ -452,7 +450,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.4.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt @@ -462,6 +460,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses virtualenv==20.17.0 # via # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index f2c69d33eb28..91337a8e2ae9 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -40,7 +40,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -49,7 +49,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.11/linux.txt # boto3 @@ -296,7 +296,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via @@ -311,7 +310,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -503,7 +502,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via @@ -519,6 +517,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses pyzmq==23.2.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt @@ -543,7 +542,7 @@ requests==2.32.3 ; python_version >= "3.10" # requests-ntlm # responses # vcert -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.11/linux.txt # moto @@ -560,7 +559,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.11/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.11/linux.txt # boto3 @@ -591,7 +590,6 @@ six==1.16.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # vcert # virtualenv @@ -638,7 +636,7 @@ typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.11/linux.txt # pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt @@ -648,6 +646,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 82a513957e75..9089498dfc5a 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -29,13 +29,13 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -211,7 +211,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in @@ -225,7 +224,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -352,7 +351,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -363,6 +361,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==25.1.2 ; sys_platform == "darwin" @@ -383,13 +382,13 @@ requests==2.32.3 ; python_version >= "3.10" # responses # vcert # vultr -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -409,7 +408,6 @@ six==1.16.0 # kubernetes # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -438,7 +436,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.2.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/base.txt @@ -447,6 +445,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index f9b15a6a1fbb..f1959c008537 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -206,7 +206,7 @@ typing-extensions==4.8.0 # myst-docutils uc-micro-py==1.0.1 # via linkify-it-py -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index ad15d217ce65..cc11a7938d0e 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -28,13 +28,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -207,7 +207,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in @@ -221,7 +220,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -352,7 +351,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -363,6 +361,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==23.2.0 # via @@ -381,13 +380,13 @@ requests==2.32.3 ; python_version >= "3.10" # pyvmomi # responses # vcert -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -409,7 +408,6 @@ six==1.16.0 # more-itertools # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -436,7 +434,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.8.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/base.txt @@ -445,6 +443,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index c2cacee3352f..c5c852278902 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -49,7 +49,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -58,7 +58,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.11/linux.txt # boto3 @@ -304,7 +304,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mccabe==0.6.1 # via pylint @@ -320,7 +319,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in @@ -468,7 +467,6 @@ pytz==2022.1 # -c requirements/static/ci/py3.11/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -484,6 +482,7 @@ pyyaml==6.0.1 # ansible-core # clustershell # kubernetes + # responses # yamllint pyzmq==23.2.0 # via @@ -517,7 +516,7 @@ resolvelib==0.5.4 # via # -c requirements/static/ci/py3.11/linux.txt # ansible-core -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.11/linux.txt # moto @@ -534,7 +533,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.11/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.11/linux.txt # boto3 @@ -566,7 +565,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -624,7 +622,7 @@ tzlocal==3.0 # via # -c requirements/static/ci/py3.11/linux.txt # apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt @@ -634,6 +632,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4eb883b38289..ce5ce8251468 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -34,13 +34,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -217,7 +217,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in @@ -231,7 +230,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -374,7 +373,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.11/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -388,6 +386,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==23.2.0 # via @@ -414,7 +413,7 @@ requests==2.32.3 ; python_version >= "3.10" # vcert resolvelib==0.5.4 # via ansible-core -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in @@ -424,7 +423,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -448,7 +447,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -485,7 +483,7 @@ typing-extensions==4.8.0 # via pytest-system-statistics tzlocal==3.0 # via apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/base.txt @@ -494,6 +492,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 9600e91a717e..805f310b3216 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -18,13 +18,13 @@ attrs==23.1.0 # pytest-system-statistics bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -203,7 +203,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via -r requirements/pytest.txt @@ -215,7 +214,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -349,7 +348,6 @@ pythonnet==3.0.1 pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -369,6 +367,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via @@ -390,13 +389,13 @@ requests==2.32.3 ; python_version >= "3.10" # pywinrm # requests-ntlm # responses -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in @@ -419,7 +418,6 @@ six==1.15.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # websocket-client smmap==4.0.0 @@ -446,7 +444,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.4.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt @@ -456,6 +454,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses virtualenv==20.17.0 # via # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 547f0f0a136e..0bac81fc85a6 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -40,7 +40,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -49,7 +49,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.12/linux.txt # boto3 @@ -296,7 +296,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via @@ -311,7 +310,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -503,7 +502,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via @@ -519,6 +517,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses pyzmq==23.2.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt @@ -543,7 +542,7 @@ requests==2.32.3 ; python_version >= "3.10" # requests-ntlm # responses # vcert -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.12/linux.txt # moto @@ -560,7 +559,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.12/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.12/linux.txt # boto3 @@ -591,7 +590,6 @@ six==1.16.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # vcert # virtualenv @@ -638,7 +636,7 @@ typing-extensions==4.8.0 # via # -c requirements/static/ci/py3.12/linux.txt # pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt @@ -648,6 +646,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 1e98f9434c9c..3afed631c68a 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -29,13 +29,13 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -211,7 +211,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in @@ -225,7 +224,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -352,7 +351,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -363,6 +361,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==25.1.2 ; sys_platform == "darwin" @@ -383,13 +382,13 @@ requests==2.32.3 ; python_version >= "3.10" # responses # vcert # vultr -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -409,7 +408,6 @@ six==1.16.0 # kubernetes # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -438,7 +436,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.2.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # -r requirements/base.txt @@ -447,6 +445,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 59c153290f65..7425178616f5 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -206,7 +206,7 @@ typing-extensions==4.8.0 # myst-docutils uc-micro-py==1.0.1 # via linkify-it-py -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index a3aa03fde944..bf54bdd29991 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -28,13 +28,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -207,7 +207,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in @@ -221,7 +220,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -352,7 +351,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -363,6 +361,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==23.2.0 # via @@ -381,13 +380,13 @@ requests==2.32.3 ; python_version >= "3.10" # pyvmomi # responses # vcert -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -409,7 +408,6 @@ six==1.16.0 # more-itertools # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -436,7 +434,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.8.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # -r requirements/base.txt @@ -445,6 +443,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 780bb9449a2e..fa1495bcfb42 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -49,7 +49,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -58,7 +58,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.12/linux.txt # boto3 @@ -304,7 +304,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mccabe==0.6.1 # via pylint @@ -320,7 +319,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in @@ -468,7 +467,6 @@ pytz==2022.1 # -c requirements/static/ci/py3.12/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -484,6 +482,7 @@ pyyaml==6.0.1 # ansible-core # clustershell # kubernetes + # responses # yamllint pyzmq==23.2.0 # via @@ -517,7 +516,7 @@ resolvelib==0.5.4 # via # -c requirements/static/ci/py3.12/linux.txt # ansible-core -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.12/linux.txt # moto @@ -534,7 +533,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.12/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.12/linux.txt # boto3 @@ -566,7 +565,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -624,7 +622,7 @@ tzlocal==3.0 # via # -c requirements/static/ci/py3.12/linux.txt # apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt @@ -634,6 +632,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 1fc7373d0c02..372b8803fec6 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -34,13 +34,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -217,7 +217,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in @@ -231,7 +230,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -374,7 +373,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.12/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -388,6 +386,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==23.2.0 # via @@ -414,7 +413,7 @@ requests==2.32.3 ; python_version >= "3.10" # vcert resolvelib==0.5.4 # via ansible-core -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in @@ -424,7 +423,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 semantic-version==2.9.0 # via etcd3-py @@ -448,7 +447,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # vcert # virtualenv @@ -485,7 +483,7 @@ typing-extensions==4.8.0 # via pytest-system-statistics tzlocal==3.0 # via apscheduler -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -r requirements/base.txt @@ -494,6 +492,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 94aa60e1112e..4bd98cad0521 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -18,13 +18,13 @@ attrs==23.1.0 # pytest-system-statistics bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -203,7 +203,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via -r requirements/pytest.txt @@ -215,7 +214,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -349,7 +348,6 @@ pythonnet==3.0.3 pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -369,6 +367,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via @@ -390,13 +389,13 @@ requests==2.32.3 ; python_version >= "3.10" # pywinrm # requests-ntlm # responses -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in @@ -419,7 +418,6 @@ six==1.15.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # websocket-client smmap==4.0.0 @@ -446,7 +444,7 @@ trustme==1.1.0 # via -r requirements/pytest.txt typing-extensions==4.4.0 # via pytest-system-statistics -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # -r requirements/base.txt @@ -456,6 +454,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses virtualenv==20.17.0 # via # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index d4e293592333..d8d669c51a11 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -44,7 +44,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in @@ -53,7 +53,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.9/linux.txt # boto3 @@ -328,7 +328,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via @@ -343,7 +342,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in @@ -575,7 +574,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via @@ -593,6 +591,7 @@ pyyaml==6.0.1 # kubernetes # napalm # pytest-salt-factories + # responses # yamlordereddictloader pyzmq==23.2.0 # via @@ -619,7 +618,7 @@ requests==2.31.0 ; python_version < "3.10" # requests-ntlm # responses # vcert -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.9/linux.txt # moto @@ -636,7 +635,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.9/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.9/linux.txt # boto3 @@ -675,7 +674,6 @@ six==1.16.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # transitions # vcert @@ -739,7 +737,7 @@ typing-extensions==4.8.0 # -c requirements/static/ci/py3.9/linux.txt # pytest-shell-utilities # pytest-system-statistics -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt @@ -749,6 +747,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 69deb706f5ff..5dc0949ae937 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -33,13 +33,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -237,7 +237,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/darwin.in @@ -251,7 +250,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -410,7 +409,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -423,6 +421,7 @@ pyyaml==6.0.1 # kubernetes # napalm # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==25.1.2 ; sys_platform == "darwin" @@ -444,13 +443,13 @@ requests==2.31.0 ; python_version < "3.10" # responses # vcert # vultr -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via @@ -477,7 +476,6 @@ six==1.16.0 # ncclient # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -519,7 +517,7 @@ typing-extensions==4.2.0 # via # pytest-shell-utilities # pytest-system-statistics -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt @@ -528,6 +526,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 18536bff332b..4299c41d8300 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -210,7 +210,7 @@ typing-extensions==4.8.0 # myst-docutils uc-micro-py==1.0.1 # via linkify-it-py -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index c03789c25794..b643c6a0e22d 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -30,13 +30,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -230,7 +230,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/freebsd.in @@ -244,7 +243,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -404,7 +403,6 @@ pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # croniter - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -417,6 +415,7 @@ pyyaml==6.0.1 # kubernetes # napalm # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -437,13 +436,13 @@ requests==2.31.0 ; python_version < "3.10" # pyvmomi # responses # vcert -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via @@ -472,7 +471,6 @@ six==1.16.0 # ncclient # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -512,7 +510,7 @@ typing-extensions==4.8.0 # via # pytest-shell-utilities # pytest-system-statistics -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt @@ -521,6 +519,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 9ac3f2a738c2..5cfa0811e60d 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -45,7 +45,7 @@ bcrypt==4.1.2 # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in @@ -54,7 +54,7 @@ boto==2.49.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # -c requirements/static/ci/py3.9/linux.txt # boto3 @@ -322,7 +322,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mccabe==0.6.1 # via pylint @@ -338,7 +337,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in @@ -526,7 +525,6 @@ pytz==2022.1 # -c requirements/static/ci/py3.9/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -543,6 +541,7 @@ pyyaml==6.0.1 # junos-eznc # kubernetes # napalm + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -574,7 +573,7 @@ requests==2.31.0 ; python_version < "3.10" # responses # twilio # vcert -responses==0.10.6 +responses==0.25.7 # via # -c requirements/static/ci/py3.9/linux.txt # moto @@ -591,7 +590,7 @@ rsa==4.7.2 # via # -c requirements/static/ci/py3.9/linux.txt # google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via # -c requirements/static/ci/py3.9/linux.txt # boto3 @@ -631,7 +630,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -710,7 +708,7 @@ tzlocal==3.0 # via # -c requirements/static/ci/py3.9/linux.txt # apscheduler -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt @@ -720,6 +718,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 1ec992c750f1..e1340d1f06c4 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -32,13 +32,13 @@ bcrypt==4.1.2 # via # -r requirements/static/ci/common.in # paramiko -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -234,7 +234,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mercurial==6.0.1 # via -r requirements/static/ci/linux.in @@ -248,7 +247,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -419,7 +418,6 @@ pytz==2022.1 # -c requirements/static/ci/../pkg/py3.9/linux.txt # apscheduler # croniter - # moto # python-telegram-bot # tempora # twilio @@ -434,6 +432,7 @@ pyyaml==6.0.1 # kubernetes # napalm # pytest-salt-factories + # responses # yamllint # yamlordereddictloader pyzmq==23.2.0 @@ -460,7 +459,7 @@ requests==2.31.0 ; python_version < "3.10" # responses # twilio # vcert -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in @@ -470,7 +469,7 @@ rpm-vercmp==0.1.2 # -r requirements/static/pkg/linux.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 scp==0.13.2 # via @@ -501,7 +500,6 @@ six==1.16.0 # python-consul # python-dateutil # pyvmomi - # responses # textfsm # transitions # vcert @@ -551,7 +549,7 @@ typing-extensions==4.8.0 # pytest-system-statistics tzlocal==3.0 # via apscheduler -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt @@ -560,6 +558,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses vcert==0.7.4 ; sys_platform != "win32" # via -r requirements/static/ci/common.in virtualenv==20.7.2 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 0d8a84982df1..66cca4a79e37 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -22,13 +22,13 @@ backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 # via -r requirements/static/ci/common.in -boto3==1.21.46 +boto3==1.39.3 # via # -r requirements/static/ci/common.in # moto boto==2.49.0 # via -r requirements/static/ci/common.in -botocore==1.24.46 +botocore==1.39.3 # via # boto3 # moto @@ -209,7 +209,6 @@ markupsafe==2.1.2 # -r requirements/base.txt # jinja2 # mako - # moto # werkzeug mock==5.1.0 # via -r requirements/pytest.txt @@ -221,7 +220,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools -moto==3.0.1 +moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 # via @@ -355,7 +354,6 @@ pythonnet==3.0.1 pytz==2022.1 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt - # moto # tempora pyvmomi==6.7.1.2018.12 # via -r requirements/static/ci/common.in @@ -376,6 +374,7 @@ pyyaml==6.0.1 # clustershell # kubernetes # pytest-salt-factories + # responses # yamllint pyzmq==25.0.2 ; sys_platform == "win32" # via @@ -397,13 +396,13 @@ requests==2.31.0 ; python_version < "3.10" # pywinrm # requests-ntlm # responses -responses==0.10.6 +responses==0.25.7 # via moto rfc3987==1.3.8 # via -r requirements/static/ci/common.in rsa==4.7.2 # via google-auth -s3transfer==0.5.2 +s3transfer==0.13.0 # via boto3 sed==0.3.1 # via -r requirements/static/ci/windows.in @@ -426,7 +425,6 @@ six==1.15.0 # python-dateutil # pyvmomi # pywinrm - # responses # textfsm # virtualenv # websocket-client @@ -458,7 +456,7 @@ typing-extensions==4.2.0 # via # pytest-shell-utilities # pytest-system-statistics -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt @@ -468,6 +466,7 @@ urllib3==1.26.20 # kubernetes # python-etcd # requests + # responses virtualenv==20.7.2 # via # -r requirements/static/ci/common.in diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fbca691b5853..5fdf64e21f10 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -118,7 +118,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index ef61fb6c155b..b5198a5d1ee9 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index dbfb2a65610d..bf28b6c5e01c 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index adf6d75970ef..e13c26da95f5 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -122,7 +122,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index c4ab7c656883..0af7760c8872 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -118,7 +118,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index de7be2ff6521..697f67522363 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 8fd1a7062ad6..924a5d7d72ba 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 2939877cd024..41b691af2a29 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -122,7 +122,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index c54942879861..bc3ef169ffa1 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -118,7 +118,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 3a73d5224fae..962834663140 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 85b904106bac..befdbda158b3 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index a9019bdb0c01..262e6f70991c 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -122,7 +122,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -urllib3==1.26.20 +urllib3==2.5.0 ; python_version >= "3.10" # via # -r requirements/base.txt # -r requirements/windows.txt diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 51a2b1f9917f..cf7c10862d05 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -118,7 +118,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/darwin.txt -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 945269d8dce4..001c68bcafd1 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/freebsd.in -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 9dd330b87b29..560c2b474e27 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -105,7 +105,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/static/pkg/linux.in -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -r requirements/base.txt # requests diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 7c1bf922c562..b700bb1f68ed 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -123,7 +123,7 @@ tempora==4.1.1 # via portend timelib==0.2.5 # via -r requirements/windows.txt -urllib3==1.26.20 +urllib3==1.26.20 ; python_version < "3.10" # via # -r requirements/base.txt # -r requirements/windows.txt diff --git a/requirements/windows.txt b/requirements/windows.txt index 43e9b7084d17..dd3c66e6f566 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -19,7 +19,8 @@ python-gnupg>=0.4.7 requests>=2.25.1 setproctitle>=1.2.3 timelib>=0.2.5 -urllib3>=1.26.5 +urllib3>=1.26.5,<2.0.0; python_version < '3.10' +urllib3>=2.5.0; python_version >= '3.10' # Watchdog pulls in a GPL-3 package, argh, which cannot be shipped on the # windows distribution package. # From b2d1a91ae3682351b97d869d4b7f828cb0068313 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 6 Jul 2025 14:16:55 -0700 Subject: [PATCH 02/58] Pull in constraints from 3007.x --- requirements/constraints.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 36f27fee7392..cf41575fcd5b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,5 +1,4 @@ -wheel <= 0.45.1 -setuptools >= 65.6.3,< 69.0 -setuptools-scm < 8.0.0 +wheel +setuptools < 80.0.0 pip >= 23.3,< 24.0 ; python_version < '3.12' pip >24 ; python_version >= '3.12' From 2db1128e464751ad862785a87b4ec1de2e6aa6fb Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 6 Jul 2025 19:32:17 -0700 Subject: [PATCH 03/58] Bump cherrypy version --- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/docs.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.11/cloud.txt | 2 +- requirements/static/ci/py3.11/docs.txt | 2 +- requirements/static/ci/py3.11/lint.txt | 2 +- requirements/static/ci/py3.11/linux.txt | 2 +- requirements/static/ci/py3.12/cloud.txt | 2 +- requirements/static/ci/py3.12/docs.txt | 2 +- requirements/static/ci/py3.12/lint.txt | 2 +- requirements/static/ci/py3.12/linux.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/docs.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/pkg/linux.in | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.12/linux.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 93d0e1745776..e542383ba31e 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -99,7 +99,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 79f7aa6ddfca..f4f00d93b906 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -25,7 +25,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/docs.in diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 201bc0a603e3..84313a6c1f68 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -111,7 +111,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 5c91853c1d64..3790bb6b30c7 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -79,7 +79,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 91337a8e2ae9..1d0215ede000 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -95,7 +95,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index f1959c008537..5147a2deec54 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -25,7 +25,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/docs.in diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index c5c852278902..1a1b89360d52 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -107,7 +107,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index ce5ce8251468..b1248691e916 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -77,7 +77,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 0bac81fc85a6..74642e3e1cc3 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -95,7 +95,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 7425178616f5..52e9d7d7eb94 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -25,7 +25,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/docs.in diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index fa1495bcfb42..e2c5c477b453 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -107,7 +107,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 372b8803fec6..7e79fbec1c7b 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -77,7 +77,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index d8d669c51a11..bff5d669dba4 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -100,7 +100,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 4299c41d8300..fd6034910fbf 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -25,7 +25,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/docs.in diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 5cfa0811e60d..8684a9592e82 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -104,7 +104,7 @@ cheroot==8.5.2 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index e1340d1f06c4..53aaf14fc957 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -76,7 +76,7 @@ cheroot==8.5.2 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/static/ci/common.in diff --git a/requirements/static/pkg/linux.in b/requirements/static/pkg/linux.in index 8ee32ad24ba0..5cec1c4a0a63 100644 --- a/requirements/static/pkg/linux.in +++ b/requirements/static/pkg/linux.in @@ -1,6 +1,6 @@ # This file only exists to trigger the right static compiled requirements destination. # Any non hard dependencies of Salt for linux can go here -cherrypy +cherrypy>=18.7.0 pycparser>=2.21; python_version >= '3.9' pyopenssl>=23.2.0 python-dateutil>=2.8.0 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index bf28b6c5e01c..ceda554deae3 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -14,7 +14,7 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 924a5d7d72ba..208eb1d256e8 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -14,7 +14,7 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index befdbda158b3..1ea1896ca5cc 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -14,7 +14,7 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 560c2b474e27..d38aee226f13 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -14,7 +14,7 @@ charset-normalizer==3.2.0 # via requests cheroot==8.5.2 # via cherrypy -cherrypy==18.6.1 +cherrypy==18.10.0 # via -r requirements/static/pkg/linux.in contextvars==2.4 # via -r requirements/base.txt From 2ca989fc4afbc34d82ed7f748403f52da67be3c8 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 7 Jul 2025 16:01:52 -0700 Subject: [PATCH 04/58] Bump more-itertools --- requirements/darwin.txt | 1 + requirements/static/ci/py3.10/cloud.txt | 4 ++-- requirements/static/ci/py3.10/docs.txt | 3 +-- requirements/static/ci/py3.10/lint.txt | 4 ++-- requirements/static/ci/py3.10/linux.txt | 4 ++-- requirements/static/ci/py3.11/cloud.txt | 4 ++-- requirements/static/ci/py3.11/docs.txt | 3 +-- requirements/static/ci/py3.11/lint.txt | 4 ++-- requirements/static/ci/py3.11/linux.txt | 4 ++-- requirements/static/ci/py3.12/cloud.txt | 4 ++-- requirements/static/ci/py3.12/docs.txt | 3 +-- requirements/static/ci/py3.12/lint.txt | 4 ++-- requirements/static/ci/py3.12/linux.txt | 4 ++-- requirements/static/ci/py3.9/cloud.txt | 4 ++-- requirements/static/ci/py3.9/docs.txt | 3 +-- requirements/static/ci/py3.9/lint.txt | 4 ++-- requirements/static/ci/py3.9/linux.txt | 4 ++-- requirements/static/pkg/linux.in | 1 + requirements/static/pkg/py3.10/darwin.txt | 3 ++- requirements/static/pkg/py3.10/linux.txt | 4 ++-- requirements/static/pkg/py3.11/darwin.txt | 3 ++- requirements/static/pkg/py3.11/linux.txt | 4 ++-- requirements/static/pkg/py3.12/darwin.txt | 3 ++- requirements/static/pkg/py3.12/linux.txt | 4 ++-- requirements/static/pkg/py3.9/darwin.txt | 3 ++- requirements/static/pkg/py3.9/linux.txt | 4 ++-- 26 files changed, 46 insertions(+), 44 deletions(-) diff --git a/requirements/darwin.txt b/requirements/darwin.txt index 348b083fe8d0..d5b3fcde2694 100644 --- a/requirements/darwin.txt +++ b/requirements/darwin.txt @@ -19,3 +19,4 @@ vultr>=1.0.1 # ImportLib-Metadata importlib-metadata>=3.3.0 zipp>=3.19.1 +more-itertools>=9.1.0 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index e542383ba31e..082bf79ffc31 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -319,11 +319,12 @@ mock==5.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -627,7 +628,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # profitbricks # pypsexec diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index f4f00d93b906..7f5ddb3f33f1 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -104,7 +104,7 @@ mdit-py-plugins==0.3.3 # via myst-docutils mdurl==0.1.2 # via markdown-it-py -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/py3.10/linux.txt # cheroot @@ -170,7 +170,6 @@ six==1.16.0 # via # -c requirements/static/ci/py3.10/linux.txt # cheroot - # more-itertools # python-dateutil # sphinxcontrib.httpdomain snowballstemmer==2.1.0 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 84313a6c1f68..3a3b3316d9e7 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -325,10 +325,11 @@ mercurial==6.0.1 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/linux.in -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -601,7 +602,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # python-consul # python-dateutil diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 3790bb6b30c7..baef1fe60688 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -233,10 +233,11 @@ mercurial==6.0.1 # via -r requirements/static/ci/linux.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -471,7 +472,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # python-consul # python-dateutil diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 1d0215ede000..8cef7b2ed342 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -301,11 +301,12 @@ mock==5.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -584,7 +585,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # profitbricks # pypsexec # python-dateutil diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 5147a2deec54..a2f07645f723 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -104,7 +104,7 @@ mdit-py-plugins==0.3.3 # via myst-docutils mdurl==0.1.2 # via markdown-it-py -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/py3.11/linux.txt # cheroot @@ -170,7 +170,6 @@ six==1.16.0 # via # -c requirements/static/ci/py3.11/linux.txt # cheroot - # more-itertools # python-dateutil # sphinxcontrib.httpdomain snowballstemmer==2.1.0 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 1a1b89360d52..b470c1ad1800 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -311,10 +311,11 @@ mercurial==6.0.1 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/linux.in -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -561,7 +562,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # python-consul # python-dateutil # pyvmomi diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index b1248691e916..4a241d8ac0f0 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -222,10 +222,11 @@ mercurial==6.0.1 # via -r requirements/static/ci/linux.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -443,7 +444,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # python-consul # python-dateutil # pyvmomi diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 74642e3e1cc3..349d1a3cf47a 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -301,11 +301,12 @@ mock==5.1.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -584,7 +585,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # profitbricks # pypsexec # python-dateutil diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 52e9d7d7eb94..39fe4fa87c00 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -104,7 +104,7 @@ mdit-py-plugins==0.3.3 # via myst-docutils mdurl==0.1.2 # via markdown-it-py -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/py3.12/linux.txt # cheroot @@ -170,7 +170,6 @@ six==1.16.0 # via # -c requirements/static/ci/py3.12/linux.txt # cheroot - # more-itertools # python-dateutil # sphinxcontrib.httpdomain snowballstemmer==2.1.0 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index e2c5c477b453..6be06585d944 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -311,10 +311,11 @@ mercurial==6.0.1 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/linux.in -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -561,7 +562,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # python-consul # python-dateutil # pyvmomi diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 7e79fbec1c7b..cce1334b36a2 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -222,10 +222,11 @@ mercurial==6.0.1 # via -r requirements/static/ci/linux.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -443,7 +444,6 @@ six==1.16.0 # jsonschema # kazoo # kubernetes - # more-itertools # python-consul # python-dateutil # pyvmomi diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index bff5d669dba4..6dd2850a3c32 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -333,11 +333,12 @@ mock==5.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -667,7 +668,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # profitbricks # pypsexec diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index fd6034910fbf..fd1d55a53f51 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -108,7 +108,7 @@ mdit-py-plugins==0.3.3 # via myst-docutils mdurl==0.1.2 # via markdown-it-py -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/py3.9/linux.txt # cheroot @@ -174,7 +174,6 @@ six==1.16.0 # via # -c requirements/static/ci/py3.9/linux.txt # cheroot - # more-itertools # python-dateutil # sphinxcontrib.httpdomain snowballstemmer==2.1.0 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 8684a9592e82..1c717ebdb1c0 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -329,10 +329,11 @@ mercurial==6.0.1 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/linux.in -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -625,7 +626,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # python-consul # python-dateutil diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 53aaf14fc957..fc7840567920 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -239,10 +239,11 @@ mercurial==6.0.1 # via -r requirements/static/ci/linux.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==5.0.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/pytest.txt + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -495,7 +496,6 @@ six==1.16.0 # junos-eznc # kazoo # kubernetes - # more-itertools # ncclient # python-consul # python-dateutil diff --git a/requirements/static/pkg/linux.in b/requirements/static/pkg/linux.in index 5cec1c4a0a63..8e0e2defa332 100644 --- a/requirements/static/pkg/linux.in +++ b/requirements/static/pkg/linux.in @@ -10,3 +10,4 @@ setproctitle>=1.2.3 timelib>=0.2.5 importlib-metadata>=3.3.0 cryptography>=42.0.0 +more-itertools>=9.1.0 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 5fdf64e21f10..298b962d6953 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 # via + # -r requirements/darwin.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index ceda554deae3..58dc3e263ed6 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -54,8 +54,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==5.0.0 +more-itertools==10.7.0 # via + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -99,7 +100,6 @@ setproctitle==1.3.2 six==1.16.0 # via # cheroot - # more-itertools # python-dateutil tempora==4.1.1 # via portend diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 0af7760c8872..9700cac23636 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 # via + # -r requirements/darwin.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 208eb1d256e8..60013be7ac20 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -54,8 +54,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==5.0.0 +more-itertools==10.7.0 # via + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -99,7 +100,6 @@ setproctitle==1.3.2 six==1.16.0 # via # cheroot - # more-itertools # python-dateutil tempora==4.1.1 # via portend diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index bc3ef169ffa1..fbbfb58a0e11 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 # via + # -r requirements/darwin.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 1ea1896ca5cc..7acfe8e51c0a 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -54,8 +54,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==5.0.0 +more-itertools==10.7.0 # via + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -99,7 +100,6 @@ setproctitle==1.3.2 six==1.16.0 # via # cheroot - # more-itertools # python-dateutil tempora==4.1.1 # via portend diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index cf7c10862d05..495dfd333077 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -63,8 +63,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==8.2.0 +more-itertools==10.7.0 # via + # -r requirements/darwin.txt # cheroot # cherrypy # jaraco.classes diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index d38aee226f13..a88aa537b570 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -54,8 +54,9 @@ markupsafe==2.1.2 # via # -r requirements/base.txt # jinja2 -more-itertools==5.0.0 +more-itertools==10.7.0 # via + # -r requirements/static/pkg/linux.in # cheroot # cherrypy # jaraco.classes @@ -99,7 +100,6 @@ setproctitle==1.3.2 six==1.16.0 # via # cheroot - # more-itertools # python-dateutil tempora==4.1.1 # via portend From f5539651530f6a9dea9afd09c35157e69a91b1d0 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 7 Jul 2025 18:38:51 -0700 Subject: [PATCH 05/58] Bump more-itertools --- requirements/darwin.txt | 3 +++ requirements/static/ci/py3.10/darwin.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 3 ++- requirements/static/pkg/py3.10/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/windows.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/windows.txt | 16 +++++++++++++--- requirements/static/pkg/py3.12/darwin.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/windows.txt | 14 +++++++++++--- requirements/static/pkg/py3.9/darwin.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/windows.txt | 16 +++++++++++++--- requirements/windows.txt | 3 +++ 14 files changed, 114 insertions(+), 28 deletions(-) diff --git a/requirements/darwin.txt b/requirements/darwin.txt index d5b3fcde2694..e953ecdeb1f2 100644 --- a/requirements/darwin.txt +++ b/requirements/darwin.txt @@ -19,4 +19,7 @@ vultr>=1.0.1 # ImportLib-Metadata importlib-metadata>=3.3.0 zipp>=3.19.1 + more-itertools>=9.1.0 +jaraco.text>=4.0.0 +jaraco.functools>=4.1.0 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 751cd85917d6..c71a5505e69c 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -230,9 +230,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/darwin.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 9089498dfc5a..7ac821618d2b 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -216,9 +216,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/darwin.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 3afed631c68a..4774863d050c 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -216,9 +216,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/darwin.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 5dc0949ae937..1c218e8da897 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -242,9 +242,10 @@ mercurial==6.0.1 # via -r requirements/static/ci/darwin.in mock==5.1.0 # via -r requirements/pytest.txt -more-itertools==8.2.0 +more-itertools==10.7.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/darwin.txt # -r requirements/pytest.txt # cheroot # cherrypy diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 298b962d6953..dbe2a5007a6e 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -44,13 +48,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/darwin.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index e13c26da95f5..dfbfbb9b3b65 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -45,13 +49,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/windows.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 9700cac23636..a0437ef2a82d 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -44,13 +48,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/darwin.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 41b691af2a29..873cc2552cec 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -45,13 +49,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/windows.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index fbbfb58a0e11..2960fc862f21 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -6,6 +6,8 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -44,13 +46,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/darwin.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +77,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 262e6f70991c..a9fd61f896d8 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -45,13 +47,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/windows.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +77,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 495dfd333077..186762bfaefa 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -6,6 +6,10 @@ # apache-libcloud==2.5.0 # via -r requirements/darwin.txt +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -44,13 +48,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/darwin.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index b700bb1f68ed..01f329cc3c11 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/windows.txt requirements/static/pkg/windows.in requirements/windows.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -45,13 +49,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.3.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/windows.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -70,6 +79,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/windows.txt b/requirements/windows.txt index dd3c66e6f566..d7c67952809d 100644 --- a/requirements/windows.txt +++ b/requirements/windows.txt @@ -29,3 +29,6 @@ wheel>=0.38.1 xmltodict>=0.13.0 importlib-metadata>=3.3.0 + +jaraco.text>=4.0.0 +jaraco.functools>=4.1.0 From 37f02acbc96fca09221e41c41fa1d2b4d4b00a82 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 7 Jul 2025 20:19:12 -0700 Subject: [PATCH 06/58] Fix lint jaraco requirements --- requirements/base.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.10/darwin.txt | 21 +++++++++++++++++++-- requirements/static/ci/py3.10/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.10/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.10/windows.txt | 21 +++++++++++++++++++-- requirements/static/ci/py3.11/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.11/darwin.txt | 21 +++++++++++++++++++-- requirements/static/ci/py3.11/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.11/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.11/windows.txt | 21 +++++++++++++++++++-- requirements/static/ci/py3.12/cloud.txt | 17 +++++++++++++++-- requirements/static/ci/py3.12/darwin.txt | 17 +++++++++++++++-- requirements/static/ci/py3.12/docs.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/freebsd.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/lint.txt | 17 +++++++++++++++-- requirements/static/ci/py3.12/linux.txt | 15 +++++++++++++-- requirements/static/ci/py3.12/windows.txt | 17 +++++++++++++++-- requirements/static/ci/py3.9/cloud.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.9/darwin.txt | 21 +++++++++++++++++++-- requirements/static/ci/py3.9/docs.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/freebsd.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/lint.txt | 22 ++++++++++++++++++++-- requirements/static/ci/py3.9/linux.txt | 19 +++++++++++++++++-- requirements/static/ci/py3.9/windows.txt | 21 +++++++++++++++++++-- requirements/static/pkg/py3.10/darwin.txt | 2 ++ requirements/static/pkg/py3.10/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.10/windows.txt | 2 ++ requirements/static/pkg/py3.11/darwin.txt | 2 ++ requirements/static/pkg/py3.11/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.11/windows.txt | 2 ++ requirements/static/pkg/py3.12/darwin.txt | 2 ++ requirements/static/pkg/py3.12/freebsd.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/linux.txt | 14 +++++++++++--- requirements/static/pkg/py3.12/windows.txt | 2 ++ requirements/static/pkg/py3.9/darwin.txt | 2 ++ requirements/static/pkg/py3.9/freebsd.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/linux.txt | 16 +++++++++++++--- requirements/static/pkg/py3.9/windows.txt | 2 ++ 45 files changed, 604 insertions(+), 80 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 139accc53d23..faca101f42ce 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -20,3 +20,5 @@ contextvars cryptography>=42.0.0 urllib3>=1.26.20,<2.0.0; python_version < '3.10' urllib3>=2.5.0; python_version >= '3.10' +jaraco.text>=4.0.0 +jaraco.functools>=4.1.0 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 082bf79ffc31..243cb9ba5904 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -35,10 +35,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.10/linux.txt @@ -238,17 +248,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -329,6 +346,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index c71a5505e69c..429301d3f86c 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -27,8 +27,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -172,15 +180,23 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 # via @@ -239,6 +255,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 7f5ddb3f33f1..91c0fd5c76f2 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.10/linux.txt @@ -65,15 +73,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -111,6 +125,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 7cd7cb0d662d..9c3474547b92 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -24,8 +24,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -165,15 +173,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -231,6 +245,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 3a3b3316d9e7..21621c16e1f1 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -44,10 +44,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.10/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.10/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.10/linux.txt @@ -241,17 +251,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -334,6 +351,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index baef1fe60688..b036930b7974 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -30,8 +30,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -174,15 +182,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -242,6 +256,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index c19f1c452c9f..9ccbc40cf415 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -18,6 +18,14 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.text +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.39.3 @@ -163,15 +171,23 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 # via @@ -218,6 +234,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 8cef7b2ed342..664e54286950 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -31,10 +31,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.11/linux.txt @@ -230,17 +240,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -311,6 +328,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 7ac821618d2b..7aaeee9746d9 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -25,8 +25,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.39.3 @@ -165,15 +173,23 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 # via @@ -225,6 +241,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index a2f07645f723..b6617beafe64 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -c requirements/static/ci/py3.11/linux.txt @@ -65,15 +73,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -111,6 +125,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index cc11a7938d0e..e6fb0694c50a 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -22,8 +22,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -161,15 +169,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -220,6 +234,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index b470c1ad1800..a2ce86d65162 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -40,10 +40,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.11/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.11/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.11/linux.txt @@ -237,17 +247,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -320,6 +337,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4a241d8ac0f0..2cbcf994742d 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -28,8 +28,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -170,15 +178,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -231,6 +245,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 805f310b3216..e3bdb35e27e6 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -16,6 +16,14 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.text +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.39.3 @@ -159,15 +167,23 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 # via @@ -214,6 +230,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 349d1a3cf47a..edf2a61e71d6 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -31,6 +31,11 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.12/linux.txt @@ -230,17 +235,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -311,6 +323,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 4774863d050c..4ea162f3cecd 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -25,6 +25,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -165,15 +169,23 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via + # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # jaraco.text +jaraco.functools==4.2.1 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 # via @@ -225,6 +237,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 39fe4fa87c00..4239771bcaad 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -6,6 +6,10 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text babel==2.9.1 # via sphinx certifi==2024.7.4 ; python_version >= "3.10" @@ -65,15 +69,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -111,6 +121,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index bf54bdd29991..8d44ad9abec8 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -22,6 +22,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -161,15 +165,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -220,6 +230,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 6be06585d944..4b202a5f0396 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -40,6 +40,11 @@ attrs==23.1.0 # -c requirements/static/ci/py3.12/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.12/linux.txt @@ -237,17 +242,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -320,6 +332,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index cce1334b36a2..eb2f7ab1e188 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -28,6 +28,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv bcrypt==4.1.2 @@ -170,15 +174,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -231,6 +241,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 4bd98cad0521..6e506bdf97ca 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -16,6 +16,10 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.12/windows.txt + # jaraco.text bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.39.3 @@ -159,15 +163,23 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via + # -c requirements/static/ci/../pkg/py3.12/windows.txt + # jaraco.text +jaraco.functools==4.2.1 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 # via @@ -214,6 +226,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 6dd2850a3c32..81fe76e70c07 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -35,10 +35,20 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.9/linux.txt @@ -249,17 +259,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -343,6 +360,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 1c218e8da897..d7fbbb25901e 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -27,8 +27,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -180,15 +188,23 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt + # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 # via @@ -251,6 +267,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index fd1d55a53f51..ce7a105aa49e 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -6,8 +6,16 @@ # alabaster==0.7.12 # via sphinx +autocommand==2.2.2 + # via + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text babel==2.9.1 # via sphinx +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -c requirements/static/ci/py3.9/linux.txt @@ -69,15 +77,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -115,6 +129,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index b643c6a0e22d..1083f4b6da97 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -24,8 +24,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -173,15 +181,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -243,6 +257,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 1c717ebdb1c0..9470763666f2 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -36,10 +36,20 @@ attrs==23.1.0 # -c requirements/static/ci/py3.9/linux.txt # aiohttp # jsonschema +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via # -c requirements/static/ci/py3.9/linux.txt # virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -c requirements/static/ci/py3.9/linux.txt @@ -243,17 +253,24 @@ jaraco.collections==3.4.0 # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -338,6 +355,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index fc7840567920..a009d1097498 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -26,8 +26,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.context bcrypt==4.1.2 # via # -r requirements/static/ci/common.in @@ -177,15 +185,21 @@ jaraco.collections==3.4.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # jaraco.collections jinja2==3.1.6 # via @@ -248,6 +262,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 66cca4a79e37..b70abd329ce5 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -18,8 +18,16 @@ attrs==23.1.0 # pytest-shell-utilities # pytest-skip-markers # pytest-system-statistics +autocommand==2.2.2 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.text backports.entry-points-selectable==1.1.0 # via virtualenv +backports.tarfile==1.2.0 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.context bcrypt==4.1.2 # via -r requirements/static/ci/common.in boto3==1.39.3 @@ -165,15 +173,23 @@ jaraco.collections==3.3.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # jaraco.text +jaraco.functools==4.2.1 + # via + # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.0 +jaraco.text==4.0.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt + # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 # via @@ -220,6 +236,7 @@ more-itertools==8.2.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text moto==5.1.6 # via -r requirements/static/ci/common.in msgpack==1.0.2 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index dbe2a5007a6e..fcbadccb221d 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -52,12 +52,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index b5198a5d1ee9..0bdcfbc74c90 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 58dc3e263ed6..e0f661f1491e 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.10/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -37,13 +41,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -61,6 +70,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index dfbfbb9b3b65..dde32e1d7309 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -53,12 +53,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/windows.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index a0437ef2a82d..7845bca32295 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -52,12 +52,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 697f67522363..d8cced4f7e62 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 60013be7ac20..d76e128cc614 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -37,13 +41,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -61,6 +70,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 873cc2552cec..2fef7e8fbda3 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -53,12 +53,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/windows.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 2960fc862f21..a68b411ff4a7 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -50,12 +50,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 962834663140..0df850df3469 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -39,13 +41,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +69,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 7acfe8e51c0a..577112a7b275 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -4,6 +4,8 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.12/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text certifi==2024.7.4 ; python_version >= "3.10" # via # -r requirements/base.txt @@ -37,13 +39,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -61,6 +68,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index a9fd61f896d8..a9435625aecc 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -51,12 +51,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/windows.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 186762bfaefa..5e5ef57e8ad5 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -52,12 +52,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/darwin.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/darwin.txt # jaraco.collections jinja2==3.1.6 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 001c68bcafd1..5654644f466a 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -39,13 +43,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -62,6 +71,7 @@ more-itertools==5.0.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index a88aa537b570..6cdd82463e99 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -4,6 +4,10 @@ # # pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.9/linux.txt requirements/base.txt requirements/static/pkg/linux.in requirements/zeromq.txt # +autocommand==2.2.2 + # via jaraco.text +backports.tarfile==1.2.0 + # via jaraco.context certifi==2023.07.22 ; python_version < "3.10" # via # -r requirements/base.txt @@ -37,13 +41,18 @@ jaraco.classes==3.2.1 # via jaraco.collections jaraco.collections==3.4.0 # via cherrypy -jaraco.functools==2.0 +jaraco.context==6.0.1 + # via jaraco.text +jaraco.functools==4.2.1 # via + # -r requirements/base.txt # cheroot # jaraco.text # tempora -jaraco.text==3.5.1 - # via jaraco.collections +jaraco.text==4.0.0 + # via + # -r requirements/base.txt + # jaraco.collections jinja2==3.1.6 # via -r requirements/base.txt jmespath==1.0.1 @@ -61,6 +70,7 @@ more-itertools==10.7.0 # cherrypy # jaraco.classes # jaraco.functools + # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt packaging==22.0 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 01f329cc3c11..23856e9e821d 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -53,12 +53,14 @@ jaraco.context==6.0.1 # via jaraco.text jaraco.functools==4.2.1 # via + # -r requirements/base.txt # -r requirements/windows.txt # cheroot # jaraco.text # tempora jaraco.text==4.0.0 # via + # -r requirements/base.txt # -r requirements/windows.txt # jaraco.collections jinja2==3.1.6 From de44a60b73a6c638b33719133187447dbe631bc9 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 02:32:01 -0700 Subject: [PATCH 07/58] Bump packaging version --- requirements/base.txt | 5 ++++- requirements/static/ci/py3.10/changelog.txt | 2 +- requirements/static/ci/py3.10/cloud.txt | 2 +- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/docs.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/lint.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/changelog.txt | 2 +- requirements/static/ci/py3.11/cloud.txt | 2 +- requirements/static/ci/py3.11/darwin.txt | 2 +- requirements/static/ci/py3.11/docs.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 2 +- requirements/static/ci/py3.11/lint.txt | 2 +- requirements/static/ci/py3.11/linux.txt | 2 +- requirements/static/ci/py3.11/windows.txt | 2 +- requirements/static/ci/py3.12/changelog.txt | 2 +- requirements/static/ci/py3.12/cloud.txt | 2 +- requirements/static/ci/py3.12/darwin.txt | 2 +- requirements/static/ci/py3.12/docs.txt | 2 +- requirements/static/ci/py3.12/freebsd.txt | 2 +- requirements/static/ci/py3.12/lint.txt | 2 +- requirements/static/ci/py3.12/linux.txt | 2 +- requirements/static/ci/py3.12/windows.txt | 2 +- requirements/static/ci/py3.9/changelog.txt | 2 +- requirements/static/ci/py3.9/cloud.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/docs.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/lint.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.12/darwin.txt | 2 +- requirements/static/pkg/py3.12/freebsd.txt | 2 +- requirements/static/pkg/py3.12/linux.txt | 2 +- requirements/static/pkg/py3.12/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- tests/pytests/unit/fileserver/test_s3fs.py | 16 +++++++++++++--- 50 files changed, 65 insertions(+), 52 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index faca101f42ce..f79ae6feb1d0 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -12,7 +12,9 @@ certifi>=2024.7.4; python_version >= '3.10' distro>=1.0.1 psutil<6.0.0; python_version <= '3.9' psutil>=5.0.0; python_version >= '3.10' -packaging>=21.3 +# Packaging 24.1 imports annotations from __future__ which breaks salt ssh +# tests on target hosts with older python versions. +packaging==24.0 looseversion croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' # We need contextvars for salt-ssh @@ -20,5 +22,6 @@ contextvars cryptography>=42.0.0 urllib3>=1.26.20,<2.0.0; python_version < '3.10' urllib3>=2.5.0; python_version >= '3.10' + jaraco.text>=4.0.0 jaraco.functools>=4.1.0 diff --git a/requirements/static/ci/py3.10/changelog.txt b/requirements/static/ci/py3.10/changelog.txt index 69cb4cf7196f..cb5e58fff017 100644 --- a/requirements/static/ci/py3.10/changelog.txt +++ b/requirements/static/ci/py3.10/changelog.txt @@ -25,7 +25,7 @@ markupsafe==2.1.2 # via # -c requirements/static/ci/py3.10/linux.txt # jinja2 -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 243cb9ba5904..d87ea7c0e236 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -377,7 +377,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.10/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 429301d3f86c..720f6533aceb 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -273,7 +273,7 @@ netaddr==0.7.19 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 91c0fd5c76f2..1bdd5285ce39 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -132,7 +132,7 @@ msgpack==1.0.2 # -r requirements/base.txt myst-docutils[linkify]==0.18.1 # via -r requirements/static/ci/docs.in -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 9c3474547b92..a248024e3688 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -263,7 +263,7 @@ netaddr==0.7.19 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 21621c16e1f1..52ef84d49489 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -378,7 +378,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.10/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index b036930b7974..792ba4c61cec 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -274,7 +274,7 @@ netaddr==0.7.19 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 9ccbc40cf415..42917ea8fcb6 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -248,7 +248,7 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/changelog.txt b/requirements/static/ci/py3.11/changelog.txt index 21561502bcf0..23f1ae20c1e5 100644 --- a/requirements/static/ci/py3.11/changelog.txt +++ b/requirements/static/ci/py3.11/changelog.txt @@ -25,7 +25,7 @@ markupsafe==2.1.2 # via # -c requirements/static/ci/py3.11/linux.txt # jinja2 -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 664e54286950..18b648632ce4 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -352,7 +352,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.11/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 7aaeee9746d9..e5374b44a285 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -255,7 +255,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index b6617beafe64..77d058a1a697 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -132,7 +132,7 @@ msgpack==1.0.2 # -r requirements/base.txt myst-docutils[linkify]==0.18.1 # via -r requirements/static/ci/docs.in -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index e6fb0694c50a..3acae4e48583 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -248,7 +248,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index a2ce86d65162..a043db6dc1cc 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -356,7 +356,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.11/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 2cbcf994742d..4559ba45bfe6 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -259,7 +259,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index e3bdb35e27e6..30d18ada1371 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -244,7 +244,7 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/changelog.txt b/requirements/static/ci/py3.12/changelog.txt index bc7cbf3cc3ea..2370d1c7ce99 100644 --- a/requirements/static/ci/py3.12/changelog.txt +++ b/requirements/static/ci/py3.12/changelog.txt @@ -25,7 +25,7 @@ markupsafe==2.1.2 # via # -c requirements/static/ci/py3.12/linux.txt # jinja2 -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index edf2a61e71d6..ebc0e349d3d1 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -347,7 +347,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.12/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 4ea162f3cecd..44d56911fbd7 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -251,7 +251,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 4239771bcaad..da2e3f338b53 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -128,7 +128,7 @@ msgpack==1.0.2 # -r requirements/base.txt myst-docutils[linkify]==0.18.1 # via -r requirements/static/ci/docs.in -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 8d44ad9abec8..5463abd29d56 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -244,7 +244,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 4b202a5f0396..a7a382952214 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -351,7 +351,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.12/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index eb2f7ab1e188..50b564dc94a7 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -255,7 +255,7 @@ multidict==6.0.2 # yarl oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 6e506bdf97ca..0605b2001612 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -240,7 +240,7 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/changelog.txt b/requirements/static/ci/py3.9/changelog.txt index 260b31738242..1251833e4442 100644 --- a/requirements/static/ci/py3.9/changelog.txt +++ b/requirements/static/ci/py3.9/changelog.txt @@ -25,7 +25,7 @@ markupsafe==2.1.2 # via # -c requirements/static/ci/py3.9/linux.txt # jinja2 -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/changelog.in diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 81fe76e70c07..9a478a4f9173 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -405,7 +405,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.9/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index d7fbbb25901e..5e642a027bbc 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -294,7 +294,7 @@ ntc-templates==1.4.1 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index ce7a105aa49e..9eef87a513d7 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -136,7 +136,7 @@ msgpack==1.0.2 # -r requirements/base.txt myst-docutils[linkify]==0.18.1 # via -r requirements/static/ci/docs.in -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 1083f4b6da97..ccb73eb65e91 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -284,7 +284,7 @@ ntc-templates==1.4.1 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 9470763666f2..40ae52810316 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -396,7 +396,7 @@ oscrypto==1.2.0 # via # -c requirements/static/ci/py3.9/linux.txt # certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index a009d1097498..9d766d1f46aa 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -289,7 +289,7 @@ ntc-templates==1.4.1 # via junos-eznc oscrypto==1.2.0 # via certvalidator -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index b70abd329ce5..eae18bfa3fe6 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -250,7 +250,7 @@ multidict==6.0.2 # yarl ntlm-auth==1.5.0 # via requests-ntlm -packaging==22.0 +packaging==24.0 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index fcbadccb221d..98e3c0694034 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -84,7 +84,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 0bdcfbc74c90..91d9b45ca95e 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -74,7 +74,7 @@ more-itertools==5.0.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index e0f661f1491e..0ac74ad8f8a2 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -73,7 +73,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index dde32e1d7309..d94777420711 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -84,7 +84,7 @@ more-itertools==8.2.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 7845bca32295..da85662ae776 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -84,7 +84,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index d8cced4f7e62..13a8727d7e07 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -74,7 +74,7 @@ more-itertools==5.0.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index d76e128cc614..e65a12c9788a 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -73,7 +73,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 2fef7e8fbda3..5aa29fb1e244 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -84,7 +84,7 @@ more-itertools==8.2.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index a68b411ff4a7..8732f1bc7d99 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -82,7 +82,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 0df850df3469..529a1aa5f10f 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -72,7 +72,7 @@ more-itertools==5.0.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 577112a7b275..41609290e38b 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -71,7 +71,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index a9435625aecc..fa0531d413e9 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -82,7 +82,7 @@ more-itertools==8.2.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 5e5ef57e8ad5..13c99c702cb7 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -84,7 +84,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 5654644f466a..111608cf971e 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -74,7 +74,7 @@ more-itertools==5.0.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 6cdd82463e99..8ab547054d8b 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -73,7 +73,7 @@ more-itertools==10.7.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.4 # via cherrypy diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 23856e9e821d..1eac1fc350ca 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -84,7 +84,7 @@ more-itertools==8.2.0 # jaraco.text msgpack==1.0.2 # via -r requirements/base.txt -packaging==22.0 +packaging==24.0 # via -r requirements/base.txt portend==2.6 # via cherrypy diff --git a/tests/pytests/unit/fileserver/test_s3fs.py b/tests/pytests/unit/fileserver/test_s3fs.py index b9e6bb897436..165eef4711f7 100644 --- a/tests/pytests/unit/fileserver/test_s3fs.py +++ b/tests/pytests/unit/fileserver/test_s3fs.py @@ -1,19 +1,29 @@ import os -import boto3 import pytest import yaml # moto must be imported before boto3 -from moto import mock_s3 +try: + import boto3 + from moto import mock_aws + + HAS_BOTO = True +except ImportError: + HAS_BOTO = False import salt.fileserver.s3fs as s3fs import salt.utils.s3 +pytestmark = [ + pytest.mark.skipif(not HAS_BOTO, reason="Missing library moto or boto3"), + pytest.mark.windows_whitelisted, +] + @pytest.fixture def bucket(): - with mock_s3(): + with mock_aws(): yield "mybucket" From 518c3e143c96c95d8634c1c82792b97df7105ae0 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 5 Jul 2025 01:48:10 -0700 Subject: [PATCH 08/58] wip --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/nightly.yml | 10 +++++----- .github/workflows/scheduled.yml | 10 +++++----- .github/workflows/staging.yml | 10 +++++----- .github/workflows/templates/layout.yml.jinja | 6 +++--- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a70d87133922..5f4157e3de93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,10 +143,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -442,7 +442,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -460,7 +460,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -476,7 +476,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + 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.10.17 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index dcbfb7e58312..483ada8720b3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -188,10 +188,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -516,7 +516,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -534,7 +534,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -550,7 +550,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + 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.10.17 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index cce1390205f7..ee03e4b97d97 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -178,10 +178,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -477,7 +477,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -495,7 +495,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -511,7 +511,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + 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.10.17 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 38b1f98515e2..96aead2ac849 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -173,10 +173,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -499,7 +499,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -517,7 +517,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -533,7 +533,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + 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.10.17 diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 0bbc5face0bb..312b20874b34 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -8,7 +8,7 @@ <%- set skip_test_coverage_check = skip_test_coverage_check|default("${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}") %> <%- set gpg_key_id = "64CBBC8173D76B3F" %> <%- set prepare_actual_release = prepare_actual_release | default(False) %> -<%- set gh_actions_workflows_python_version = "3.10" %> +<%- set gh_actions_workflows_python_version = "3.11" %> <%- set nox_archive_hashfiles = "${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py', 'pkg/common/env-cleanup-rules.yml', '.github/workflows/build-deps-ci-action.yml') }}" %> --- <%- block name %> @@ -191,10 +191,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python <{ gh_actions_workflows_python_version }> uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "<{ gh_actions_workflows_python_version }>" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts From 830d5ec8183aa28f77b9554823de5433aa3ab3b2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 5 Jul 2025 15:02:50 -0700 Subject: [PATCH 09/58] Update more workflow steps to use py 3.11 --- .github/workflows/ci.yml | 14 ++++++++------ .github/workflows/nightly.yml | 9 +++++---- .github/workflows/scheduled.yml | 9 +++++---- .github/workflows/staging.yml | 9 +++++---- .github/workflows/templates/ci.yml.jinja | 14 ++++++++------ 5 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f4157e3de93..2079c6e300fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -261,10 +261,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -381,10 +382,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -498,10 +499,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" + - name: Setup Python Tools Scripts id: python-tools-scripts diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 483ada8720b3..32cdb28176f9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -306,10 +306,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -431,10 +432,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index ee03e4b97d97..f5572605c943 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -296,10 +296,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -416,10 +417,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 96aead2ac849..419992c3e97d 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -291,10 +291,11 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -412,10 +413,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 4de01a3d0735..aa0a79cf339d 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -64,10 +64,11 @@ steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python <{ gh_actions_workflows_python_version }> uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "<{ gh_actions_workflows_python_version }>" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -210,10 +211,10 @@ steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python <{ gh_actions_workflows_python_version }> uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "<{ gh_actions_workflows_python_version }>" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -291,10 +292,11 @@ steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python <{ gh_actions_workflows_python_version }> uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "<{ gh_actions_workflows_python_version }>" + - name: Setup Python Tools Scripts id: python-tools-scripts From fcf3f8531517f117ebe736faaeb938681848310a Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 14:23:10 -0700 Subject: [PATCH 10/58] Pass ci python version into workflows --- .github/workflows/build-deps-ci-action.yml | 22 +++++++++------- .github/workflows/build-docs.yml | 2 +- .github/workflows/build-packages.yml | 8 ++++-- .github/workflows/build-salt-onedir.yml | 14 ++++++---- .github/workflows/ci.yml | 9 ++++--- .github/workflows/nightly.yml | 10 ++++--- .github/workflows/scheduled.yml | 9 ++++--- .github/workflows/staging.yml | 10 ++++--- .../templates/build-ci-deps.yml.jinja | 3 ++- .../templates/build-packages.yml.jinja | 1 + .github/workflows/templates/ci.yml.jinja | 1 + .../templates/test-salt-pkg.yml.jinja | 2 +- .../workflows/templates/test-salt.yml.jinja | 2 +- .github/workflows/test-action.yml | 26 +++++++++---------- .github/workflows/test-packages-action.yml | 17 ++++++------ 15 files changed, 81 insertions(+), 55 deletions(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 5ccabd6d8220..908396d2f9b0 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -27,8 +27,13 @@ on: python-version: required: false type: string - description: The python version to run tests with - default: "3.10" + description: The python version bundled with Salt + default: "3.11" + ci-python-version: + required: false + type: string + description: The python version used by workflows + default: "3.11" package-name: required: false type: string @@ -69,9 +74,10 @@ jobs: matrix: include: ${{ fromJSON(inputs.matrix)['linux'] }} steps: - - uses: actions/setup-python@v5 + - name: Setup Python Version ${{ inputs.ci-python-version }} + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: "Throttle Builds" shell: bash @@ -81,10 +87,6 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Cache nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }} id: nox-dependencies-cache uses: ./.github/actions/cache @@ -196,11 +198,11 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install System Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 3372769516a8..a7b9683e5c63 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - name: Download Release Patch if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index a03db59ecc74..219ed47c9eeb 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -16,6 +16,10 @@ on: required: true type: string description: The version of python to use with relenv + ci-python-version: + required: true + type: string + description: The version of python to use in workflows sign-rpm-packages: type: boolean default: false @@ -288,7 +292,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -410,7 +414,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 39c5578eb0bb..149c791bb1ae 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -20,6 +20,10 @@ on: required: true type: string description: The version of python to use with relenv + ci-python-version: + required: true + type: string + description: The version of python in workflows matrix: type: string required: true @@ -64,7 +68,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -120,10 +124,10 @@ jobs: t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -176,10 +180,10 @@ jobs: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2079c6e300fc..045b35677e5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -415,6 +415,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.4" python-version: "3.10.17" + 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'] }} @@ -430,6 +431,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -443,7 +445,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -461,7 +464,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.11" + ci-python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -477,7 +480,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + 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.10.17 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 32cdb28176f9..78e77fea14d7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -465,6 +465,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.4" python-version: "3.10.17" + 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'] }} @@ -480,6 +481,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -500,6 +502,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -517,7 +520,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -535,7 +539,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.11" + ci-python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -551,7 +555,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + 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.10.17 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index f5572605c943..b8ba2f0a8866 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -450,6 +450,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.4" python-version: "3.10.17" + 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'] }} @@ -465,6 +466,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -478,7 +480,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -496,7 +499,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.11" + ci-python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -512,7 +515,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + 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.10.17 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 419992c3e97d..47db1406c997 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -446,6 +446,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.4" python-version: "3.10.17" + 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'] }} @@ -462,6 +463,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -483,6 +485,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.4" python-version: "3.10.17" + ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -500,7 +503,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -518,7 +522,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.11" + ci-python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -534,7 +538,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + 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.10.17 diff --git a/.github/workflows/templates/build-ci-deps.yml.jinja b/.github/workflows/templates/build-ci-deps.yml.jinja index e7856114100f..871bcb3329d9 100644 --- a/.github/workflows/templates/build-ci-deps.yml.jinja +++ b/.github/workflows/templates/build-ci-deps.yml.jinja @@ -17,7 +17,8 @@ with: nox-session: ci-test-onedir nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" + python-version: "<{ python_version }>" + ci-python-version: "<{ gh_actions_workflows_python_version }>" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" diff --git a/.github/workflows/templates/build-packages.yml.jinja b/.github/workflows/templates/build-packages.yml.jinja index ffc2da893fab..c4e0eed88481 100644 --- a/.github/workflows/templates/build-packages.yml.jinja +++ b/.github/workflows/templates/build-packages.yml.jinja @@ -24,6 +24,7 @@ cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "<{ relenv_version }>" python-version: "<{ python_version }>" + ci-python-version: "<{ gh_actions_workflows_python_version }>" source: "<{ backend }>" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index aa0a79cf339d..71a79edf8c8e 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -250,6 +250,7 @@ salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "<{ relenv_version }>" python-version: "<{ python_version }>" + ci-python-version: "<{ gh_actions_workflows_python_version }>" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} diff --git a/.github/workflows/templates/test-salt-pkg.yml.jinja b/.github/workflows/templates/test-salt-pkg.yml.jinja index a8c327e92f0a..397a8be2be74 100644 --- a/.github/workflows/templates/test-salt-pkg.yml.jinja +++ b/.github/workflows/templates/test-salt-pkg.yml.jinja @@ -11,7 +11,7 @@ nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" + ci-python-version: "<{ gh_actions_workflows_python_version }>" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> skip-code-coverage: <{ skip_test_coverage_check }> testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} diff --git a/.github/workflows/templates/test-salt.yml.jinja b/.github/workflows/templates/test-salt.yml.jinja index 53a7e5f1e1ec..999138a7aab7 100644 --- a/.github/workflows/templates/test-salt.yml.jinja +++ b/.github/workflows/templates/test-salt.yml.jinja @@ -13,7 +13,7 @@ with: nox-session: ci-test-onedir nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" + ci-python-version: "<{ gh_actions_workflows_python_version }>" 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 }}|<{ python_version }> diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 7bef19bf1894..a46bf1994562 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -12,11 +12,11 @@ on: required: true type: string description: JSON string containing information about what and how to run the test suite - python-version: - required: false + ci-python-version: + required: true type: string description: The python version to run tests with - default: "3.10" + default: "3.11" salt-version: type: string required: true @@ -94,10 +94,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -406,10 +406,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -722,10 +722,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Salt Version run: | @@ -990,7 +990,7 @@ jobs: steps: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: "Throttle Builds" shell: bash @@ -1295,7 +1295,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: "${{ inputs.ci-python-version }}" - name: "Throttle Builds" shell: bash @@ -1344,10 +1344,10 @@ jobs: run: | tree -a artifacts - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install Nox run: | diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index 435dc29a77fa..5865a66a3c48 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -20,11 +20,10 @@ on: required: true type: string description: The nox version to install - python-version: - required: false + ci-python-version: + required: true type: string description: The python version to run tests with - default: "3.10" nox-session: required: false type: string @@ -86,10 +85,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -240,10 +239,10 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ matrix.platform }}-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install Nox run: | @@ -327,10 +326,10 @@ jobs: include: ${{ fromJSON(inputs.matrix)['windows'] }} steps: - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: "Throttle Builds" shell: bash From 7dfcfcb0510e78e3c7e01537ac2b437a4da621fc Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 14:28:06 -0700 Subject: [PATCH 11/58] Fix python version input in test action --- .github/actions/ssh-tunnel/action.yml | 2 +- .github/workflows/test-action.yml | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/actions/ssh-tunnel/action.yml b/.github/actions/ssh-tunnel/action.yml index 3f12208b7a25..5c76bb8e564a 100644 --- a/.github/actions/ssh-tunnel/action.yml +++ b/.github/actions/ssh-tunnel/action.yml @@ -23,7 +23,7 @@ runs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - name: Install ssh if: ${{ runner.os == 'Windows' }} diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index a46bf1994562..6afa916e7e25 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -16,7 +16,6 @@ on: required: true type: string description: The python version to run tests with - default: "3.11" salt-version: type: string required: true @@ -988,7 +987,9 @@ jobs: matrix: include: ${{ fromJSON(inputs.matrix)['windows'] }} steps: - - uses: actions/setup-python@v5 + + - name: Setup Python ${{ inputs.ci-python-version }} + uses: actions/setup-python@v5 with: python-version: ${{ inputs.ci-python-version }} @@ -1026,11 +1027,6 @@ jobs: run: | echo true - - name: Setup Python ${{ inputs.python-version }} - uses: actions/setup-python@v5 - with: - python-version: "${{ inputs.python-version }}" - - name: Install Nox run: | python3 -m pip install 'nox==${{ inputs.nox-version }}' From 324d54d12607bfe2514a602108393ff4e9d74a73 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 14:50:24 -0700 Subject: [PATCH 12/58] Lint everything on full test run --- .github/workflows/ci.yml | 1 + .github/workflows/lint-action.yml | 8 ++++++-- .github/workflows/nightly.yml | 1 + .github/workflows/scheduled.yml | 1 + .github/workflows/staging.yml | 1 + .github/workflows/templates/ci.yml.jinja | 1 + 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 045b35677e5b..7a70fe35a1bf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -243,6 +243,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index 09f614fbf36c..97a9299d0797 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -8,6 +8,10 @@ on: required: true type: string description: JSON string containing information about changed files + full: + required: true + type: string + description: When this is true lint will run against all files env: @@ -49,7 +53,7 @@ jobs: nox --forcecolor -e lint-salt -- ${{ join(fromJSON(inputs.changed-files)['salt_files'], ' ') }} - name: Lint ALL Files - if: github.event_name != 'pull_request' || fromJSON(inputs.changed-files)['lint'] + if: inputs.full || fromJSON(inputs.changed-files)['lint'] env: SKIP_REQUIREMENTS_INSTALL: YES run: | @@ -89,7 +93,7 @@ jobs: nox --forcecolor -e lint-tests -- ${{ join(fromJSON(inputs.changed-files)['tests_files'], ' ') }} - name: Lint ALL Files - if: github.event_name != 'pull_request' || fromJSON(inputs.changed-files)['lint'] + if: inputs.full || fromJSON(inputs.changed-files)['lint'] env: SKIP_REQUIREMENTS_INSTALL: YES run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 78e77fea14d7..ec1c9bcb1374 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -288,6 +288,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index b8ba2f0a8866..6b65b69af218 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -278,6 +278,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 47db1406c997..62dec847bfc2 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -273,6 +273,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 71a79edf8c8e..fb16fdfb52bf 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -35,6 +35,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} <%- endif %> From 4e97dcbace819a56742437cdf7496decb07d33fa Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 14:53:36 -0700 Subject: [PATCH 13/58] Run NSIS on full testruns --- .github/workflows/ci.yml | 1 + .github/workflows/lint-action.yml | 2 +- .github/workflows/nightly.yml | 1 + .github/workflows/nsis-tests.yml | 9 +++++++-- .github/workflows/scheduled.yml | 1 + .github/workflows/staging.yml | 1 + .github/workflows/templates/ci.yml.jinja | 1 + 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a70fe35a1bf..324cc1a16fe2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -251,6 +251,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index 97a9299d0797..5d09eaa5ac3d 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -10,7 +10,7 @@ on: description: JSON string containing information about changed files full: required: true - type: string + type: boolean description: When this is true lint will run against all files diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ec1c9bcb1374..adc51f0c87e9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -296,6 +296,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/nsis-tests.yml b/.github/workflows/nsis-tests.yml index e80ed43f4099..872e1b4bab10 100644 --- a/.github/workflows/nsis-tests.yml +++ b/.github/workflows/nsis-tests.yml @@ -8,13 +8,18 @@ on: required: true type: string description: JSON string containing information about changed files + full: + required: true + type: boolean + description: Is this a full testrun or not + jobs: Test-NSIS-Logic: name: Logic Tests runs-on: - windows-latest - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} steps: @@ -42,7 +47,7 @@ jobs: name: Stress Tests runs-on: - windows-latest - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} steps: diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 6b65b69af218..68c66f27d4bd 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -286,6 +286,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 62dec847bfc2..46778776a8b5 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -281,6 +281,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index fb16fdfb52bf..234ea63459cf 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -49,6 +49,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} <%- endif %> From 6ecca632af91f605308ed35097c11346067e5b47 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 14:54:35 -0700 Subject: [PATCH 14/58] Build deps uses ci-python-version --- .github/workflows/build-deps-ci-action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 908396d2f9b0..767cbaf6f30d 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -291,11 +291,11 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' From 3db8ba02b3fb6e102dbbca193461ee75dc6125f2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 15:28:42 -0700 Subject: [PATCH 15/58] Fix full check for lint and nsis --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/scheduled.yml | 4 ++-- .github/workflows/staging.yml | 4 ++-- .github/workflows/templates/ci.yml.jinja | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 324cc1a16fe2..b2d10b5ec2b0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -243,7 +243,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -251,7 +251,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index adc51f0c87e9..7dd707807387 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -288,7 +288,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -296,7 +296,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 68c66f27d4bd..60b7ddf22bb4 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -278,7 +278,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -286,7 +286,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 46778776a8b5..3942f6e7a852 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -273,7 +273,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -281,7 +281,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 234ea63459cf..872eabcc827f 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -35,7 +35,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} <%- endif %> @@ -49,7 +49,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(steps.workflow-config.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} <%- endif %> From 6decc74cb03418545e5f049a005395e28dfb6a12 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 17:04:07 -0700 Subject: [PATCH 16/58] Fix full conditional --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 4 ++-- .github/workflows/scheduled.yml | 4 ++-- .github/workflows/staging.yml | 4 ++-- .github/workflows/templates/ci.yml.jinja | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2d10b5ec2b0..ff5b3375ebf3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -243,7 +243,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -251,7 +251,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7dd707807387..68368e162b9c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -288,7 +288,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -296,7 +296,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 60b7ddf22bb4..41878a23a441 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -278,7 +278,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -286,7 +286,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3942f6e7a852..e14dc94b4707 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -273,7 +273,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -281,7 +281,7 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 872eabcc827f..6d9d59205ea4 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -35,7 +35,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} <%- endif %> @@ -49,7 +49,7 @@ - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} - full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] != 'full' }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} <%- endif %> From 5ffa329e4c252a5c5212106a49ea954dc2a4e3d1 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 17:11:50 -0700 Subject: [PATCH 17/58] Fix lint action conditional --- .github/workflows/lint-action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index 5d09eaa5ac3d..d53b0b7631ea 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -23,7 +23,7 @@ jobs: Salt: name: Lint Salt's Source Code runs-on: ubuntu-22.04 - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }} container: image: ghcr.io/saltstack/salt-ci-containers/python:3.10 @@ -63,7 +63,7 @@ jobs: Tests: name: Lint Salt's Test Suite runs-on: ubuntu-22.04 - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }} container: image: ghcr.io/saltstack/salt-ci-containers/python:3.10 From 488e254a4734295715bb0733ef2efd8e3b62a4fe Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 19:02:14 -0700 Subject: [PATCH 18/58] Bump cache seed --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/layout.yml.jinja | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff5b3375ebf3..ebb2e22afdc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-1 # Bump the number to invalidate all caches + CACHE_SEED: SEED-2 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 68368e162b9c..6a4c6001d433 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-1 # Bump the number to invalidate all caches + CACHE_SEED: SEED-2 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 41878a23a441..a5a2fb5c0b72 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,7 +12,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-1 # Bump the number to invalidate all caches + CACHE_SEED: SEED-2 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index e14dc94b4707..573bd3c1f7aa 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -41,7 +41,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-1 # Bump the number to invalidate all caches + CACHE_SEED: SEED-2 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 312b20874b34..be48028d91c3 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -38,7 +38,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-1 # Bump the number to invalidate all caches + CACHE_SEED: SEED-2 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" From 0d04d247de55396b63da54123d8d99ce03c16ae9 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 21:30:16 -0700 Subject: [PATCH 19/58] Clean up more workflow python versions --- .github/workflows/ci.yml | 1 + .github/workflows/depcheck.yml | 23 +- .github/workflows/nightly.yml | 1 + .github/workflows/nsis-tests.yml | 12 +- .github/workflows/release-update-winrepo.yml | 10 +- .../workflows/release-upload-virustotal.yml | 11 +- .github/workflows/release.yml | 12 +- .github/workflows/scheduled.yml | 1 + .github/workflows/ssh-debug.yml | 10 +- .github/workflows/staging.yml | 1 + .github/workflows/templates/ci.yml.jinja | 1 + .../test-salt-pkg-repo-downloads.yml.jinja | 31 - .../test-package-downloads-action.yml | 689 ------------------ 13 files changed, 56 insertions(+), 747 deletions(-) delete mode 100644 .github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja delete mode 100644 .github/workflows/test-package-downloads-action.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebb2e22afdc3..24c831eef3f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -252,6 +252,7 @@ jobs: with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: "3.11" prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/depcheck.yml b/.github/workflows/depcheck.yml index 955b6cb6fb8b..f8333408bb89 100644 --- a/.github/workflows/depcheck.yml +++ b/.github/workflows/depcheck.yml @@ -136,10 +136,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -259,10 +259,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -394,10 +394,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -456,7 +456,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -475,7 +476,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + ci-python-version: "3.11" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -491,7 +492,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + 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.10.17 @@ -513,10 +514,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts id: python-tools-scripts diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 6a4c6001d433..edfd2b30a793 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -297,6 +297,7 @@ jobs: with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: "3.11" prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/nsis-tests.yml b/.github/workflows/nsis-tests.yml index 872e1b4bab10..2ab93755cab9 100644 --- a/.github/workflows/nsis-tests.yml +++ b/.github/workflows/nsis-tests.yml @@ -12,6 +12,10 @@ on: required: true type: boolean description: Is this a full testrun or not + ci-python-version: + required: true + type: string + description: The version of python to use for the workflow run jobs: @@ -26,10 +30,10 @@ jobs: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Install NSIS run: .\pkg\windows\install_nsis.cmd -CICD @@ -54,10 +58,10 @@ jobs: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Install NSIS run: .\pkg\windows\install_nsis.cmd -CICD diff --git a/.github/workflows/release-update-winrepo.yml b/.github/workflows/release-update-winrepo.yml index 0492cd40c498..a9e7414425d3 100644 --- a/.github/workflows/release-update-winrepo.yml +++ b/.github/workflows/release-update-winrepo.yml @@ -12,6 +12,12 @@ on: description: > The Salt version to set prior to building packages and staging the release. (DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0). + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run permissions: contents: read @@ -33,10 +39,10 @@ jobs: path: winrepo repository: twangboy/salt-winrepo-ng - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Add Version to Minion Definition File working-directory: salt diff --git a/.github/workflows/release-upload-virustotal.yml b/.github/workflows/release-upload-virustotal.yml index dc760371bb21..41c3dfb5444a 100644 --- a/.github/workflows/release-upload-virustotal.yml +++ b/.github/workflows/release-upload-virustotal.yml @@ -12,6 +12,12 @@ on: description: > The Salt version to get from staging to upload to VirusTotal. (DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0). + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run permissions: contents: read @@ -36,10 +42,11 @@ jobs: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86e64aa0e1d9..e839de37f18c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -63,10 +63,10 @@ jobs: with: fetch-depth: 0 # Full clone to also get the tags to get the right salt version - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -116,10 +116,10 @@ jobs: with: ssh-key: ${{ secrets.GHA_SSH_KEY }} - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -192,10 +192,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index a5a2fb5c0b72..2bfa4bc48678 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -287,6 +287,7 @@ jobs: with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: "3.11" prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/ssh-debug.yml b/.github/workflows/ssh-debug.yml index 992f6b6a7b2d..8f34f5f6a97e 100644 --- a/.github/workflows/ssh-debug.yml +++ b/.github/workflows/ssh-debug.yml @@ -20,6 +20,12 @@ on: type: boolean default: false description: Run sshd with debug enabled. + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run @@ -33,10 +39,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 573bd3c1f7aa..067a67c00358 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -282,6 +282,7 @@ jobs: with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: "3.11" prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 6d9d59205ea4..69c1e6287cfb 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -50,6 +50,7 @@ with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: "<{ gh_actions_workflows_python_version }>" <%- endif %> diff --git a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja b/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja deleted file mode 100644 index 0e9abacf1cb4..000000000000 --- a/.github/workflows/templates/test-salt-pkg-repo-downloads.yml.jinja +++ /dev/null @@ -1,31 +0,0 @@ - - <%- set job_name = "pkg-download-tests" %> - - <{ job_name }>: - <%- do test_repo_needs.append(job_name) %> - <%- do conclusion_needs.append(job_name) %> - name: Package Downloads - <%- if gh_environment == "staging" %> - if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-download'] }} - <%- else %> - if: ${{ inputs.skip-salt-pkg-download-test-suite == false }} - <%- endif %> - needs: - - prepare-workflow - - build-ci-deps - <%- if gh_environment == "release" %> - - download-onedir-artifact - <%- else %> - - build-salt-onedir - <%- endif %> - uses: ./.github/workflows/test-package-downloads-action.yml - with: - nox-session: ci-test-onedir - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }> - salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - environment: <{ gh_environment }> - nox-version: <{ nox_version }> - python-version: "<{ gh_actions_workflows_python_version }>" - skip-code-coverage: true - latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}" - secrets: inherit diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml deleted file mode 100644 index bd2453acff5f..000000000000 --- a/.github/workflows/test-package-downloads-action.yml +++ /dev/null @@ -1,689 +0,0 @@ -name: Test Download Packages - -on: - workflow_call: - inputs: - salt-version: - type: string - required: true - description: The Salt version of the packages to install and test - cache-prefix: - required: true - type: string - description: Seed used to invalidate caches - environment: - required: true - type: string - description: The environment to run tests against - latest-release: - required: true - type: string - description: The latest salt release - nox-version: - required: true - type: string - description: The nox version to install - python-version: - required: false - type: string - description: The python version to run tests with - default: "3.10" - package-name: - required: false - type: string - description: The onedir package name to use - default: salt - skip-code-coverage: - required: false - type: boolean - description: Skip code coverage - default: false - nox-session: - required: false - type: string - description: The nox session to run - default: ci-test-onedir - -env: - COLUMNS: 190 - AWS_MAX_ATTEMPTS: "10" - AWS_RETRY_MODE: "adaptive" - PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }} - PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }} - PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }} - PIP_DISABLE_PIP_VERSION_CHECK: "1" - RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" - -jobs: - - generate-matrix: - name: Generate Matrix - runs-on: ubuntu-latest - outputs: - matrix-include: ${{ steps.generate-matrix.outputs.matrix }} - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - with: - cache-prefix: ${{ inputs.cache-prefix }} - env: - PIP_INDEX_URL: https://pypi.org/simple - - - name: Generate Test Matrix - id: generate-matrix - run: | - tools ci pkg-downloads-matrix - - linux: - name: Linux - needs: - - generate-matrix - runs-on: - - ubuntu-latest - env: - USE_S3_CACHE: 'true' - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['linux'] }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.tar.xz - - - name: Download nox.linux.${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.tar.* artifact for session ${{ inputs.nox-session }} - uses: actions/download-artifact@v4 - with: - name: nox-linux-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.nox-session }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - with: - cache-prefix: ${{ inputs.cache-prefix }}-pkg-download-linux - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info - run: | - tools --timestamps --timeout-secs=1800 vm test --skip-requirements-install --print-system-information-only \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v4 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }}-${{ matrix.pkg-type }} - path: | - artifacts/ - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - macos: - name: MacOS - needs: - - generate-matrix - runs-on: ${{ matrix.distro-slug == 'macos-13-arm64' && 'macos-13-xlarge' || matrix.distro-slug }} - env: - USE_S3_CACHE: 'false' - PIP_INDEX_URL: https://pypi.org/simple - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }} - - steps: - - - name: "Throttle Builds" - shell: bash - run: | - t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Install System Dependencies - run: | - brew install tree - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - - - name: Set up Python ${{ inputs.python-version }} - uses: actions/setup-python@v5 - with: - python-version: "${{ inputs.python-version }}" - update-environment: true - - - name: Install Nox - run: | - python3 -m pip install 'nox==${{ inputs.nox-version }}' - - - name: Download nox.macos.${{ matrix.arch }}.tar.* artifact for session ${{ inputs.nox-session }} - uses: actions/download-artifact@v4 - with: - name: nox-macos-${{ matrix.arch }}-${{ inputs.nox-session }} - - - name: Decompress .nox Directory - run: | - nox --force-color -e decompress-dependencies -- macos ${{ matrix.arch }} - - - name: Show System Info - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_SYSTEM_INFO_ONLY: "1" - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Run Package Download Tests - env: - SKIP_REQUIREMENTS_INSTALL: "1" - PRINT_TEST_SELECTION: "0" - PRINT_TEST_PLAN_ONLY: "0" - PRINT_SYSTEM_INFO: "0" - RERUN_FAILURES: "1" - GITHUB_ACTIONS_PIPELINE: "1" - SKIP_INITIAL_GH_ACTIONS_FAILURES: "1" - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - COVERAGE_CONTEXT: ${{ matrix.distro-slug }} - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - nox --force-color -e combine-coverage - - - name: Prepare Test Run Artifacts - id: download-artifacts-from-vm - if: always() && job.status != 'cancelled' - run: | - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/macos/codecov - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/macos/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() - uses: actions/upload-artifact@v4 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }}-${{ matrix.pkg-type }} - path: | - artifacts/ - !artifacts/salt/* - !artifacts/salt-*.tar.* - - - windows: - name: Windows - needs: - - generate-matrix - env: - USE_S3_CACHE: 'true' - runs-on: - - ubuntu-latest - environment: ${{ inputs.environment }} - timeout-minutes: 120 # 2 Hours - More than this and something is wrong - strategy: - fail-fast: false - matrix: - include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['windows'] }} - - steps: - - name: Checkout Source Code - uses: actions/checkout@v4 - - - name: Download Onedir Tarball as an Artifact - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - path: artifacts/ - - - name: Decompress Onedir Tarball - shell: bash - run: | - python3 -c "import os; os.makedirs('artifacts', exist_ok=True)" - cd artifacts - tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - - - name: Download nox.windows.${{ matrix.arch }}.tar.* artifact for session ${{ inputs.nox-session }} - uses: actions/download-artifact@v4 - with: - name: nox-windows-${{ matrix.arch }}-${{ inputs.nox-session }} - - - name: Setup Python Tools Scripts - uses: ./.github/actions/setup-python-tools-scripts - with: - cache-prefix: ${{ inputs.cache-prefix }}-pkg-download-windows - - - name: Get Salt Project GitHub Actions Bot Environment - run: | - TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30") - SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment) - echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV" - - - name: Start VM - id: spin-up-vm - run: | - tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ matrix.distro-slug }} - - - name: List Free Space - run: | - tools --timestamps vm ssh ${{ matrix.distro-slug }} -- df -h || true - - - name: Upload Checkout To VM - run: | - tools --timestamps vm rsync ${{ matrix.distro-slug }} - - - name: Decompress .nox Directory - run: | - tools --timestamps vm decompress-dependencies ${{ matrix.distro-slug }} - - - name: Show System Info - run: | - tools --timestamps --timeout-secs=1800 vm test --skip-requirements-install --print-system-information-only \ - --nox-session=${{ inputs.nox-session }}-pkgs ${{ matrix.distro-slug }} -- download-pkgs - - - name: Run Package Download Tests - env: - SALT_RELEASE: "${{ inputs.salt-version }}" - SALT_REPO_ARCH: ${{ matrix.arch }} - LATEST_SALT_RELEASE: "${{ inputs.latest-release }}" - SALT_REPO_TYPE: ${{ inputs.environment }} - SALT_REPO_USER: ${{ secrets.SALT_REPO_USER }} - SALT_REPO_PASS: ${{ secrets.SALT_REPO_PASS }} - SALT_REPO_DOMAIN_RELEASE: ${{ vars.SALT_REPO_DOMAIN_RELEASE || 'repo.saltproject.io' }} - SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }} - SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}" - DOWNLOAD_TEST_PACKAGE_TYPE: ${{ matrix.pkg-type }} - run: | - tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \ - -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \ - -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \ - --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ matrix.distro-slug }} -- download-pkgs - - - name: Combine Coverage Reports - if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled' - run: | - tools --timestamps vm combine-coverage ${{ matrix.distro-slug }} - - - name: Download Test Run Artifacts - id: download-artifacts-from-vm - if: always() && steps.spin-up-vm.outcome == 'success' - run: | - tools --timestamps vm download-artifacts ${{ matrix.distro-slug }} - # Delete the salt onedir, we won't need it anymore and it will prevent - # from it showing in the tree command below - rm -rf artifacts/salt* - tree -a artifacts - - - name: Destroy VM - if: always() - run: | - tools --timestamps vm destroy --no-wait ${{ matrix.distro-slug }} || true - - - name: Fix file ownership - run: | - sudo chown -R "$(id -un)" . - - - name: Install Codecov CLI - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - # We can't yet use tokenless uploads with the codecov CLI - # python3 -m pip install codecov-cli - # - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --import - curl -Os https://uploader.codecov.io/latest/linux/codecov - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/latest/linux/codecov.SHA256SUM.sig - gpg --verify codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - chmod +x codecov - - - name: Upload Source Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/salt.xml ]; then - echo "The artifacts/coverage/salt.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/salt.xml \ - # --flag salt --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/salt.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags salt,${{ matrix.distro-slug }},pkg \ - --name salt.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Tests Code Coverage To Codecov - if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled' - run: | - if [ ! -s artifacts/coverage/tests.xml ]; then - echo "The artifacts/coverage/tests.xml file does not exist" - exit 1 - fi - # We can't yet use tokenless uploads with the codecov CLI - #codecovcli --auto-load-params-from GithubActions --verbose --token ${{ secrets.CODECOV_TOKEN }} \ - # do-upload --git-service github --sha ${{ github.sha }} \ - # --file artifacts/coverage/tests.xml \ - # --flag tests --flag ${{ matrix.distro-slug }} --flag pkg \ - # --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs - n=0 - until [ "$n" -ge 5 ] - do - if ./codecov --file artifacts/coverage/tests.xml \ - --sha ${{ github.event.pull_request.head.sha || github.sha }} ${{ github.event_name == 'pull_request' && format('--parent {0}', github.event.pull_request.base.sha) }} \ - --flags tests,${{ matrix.distro-slug }},pkg \ - --name tests.${{ matrix.distro-slug }}.${{ inputs.nox-session }}.download-pkgs --nonZero; then - rc=$? - break - fi - rc=$? - n=$((n+1)) - sleep 15 - done - if [ "$rc" -ne 0 ]; then - echo "Failed to upload codecov stats" - exit 1 - fi - - - name: Upload Test Run Artifacts - if: always() && steps.download-artifacts-from-vm.outcome == 'success' - uses: actions/upload-artifact@v4 - with: - name: pkg-testrun-artifacts-${{ matrix.distro-slug }}-${{ matrix.arch }}-${{ matrix.pkg-type }} - path: | - artifacts/ - !artifacts/salt/* - !artifacts/salt-*.tar.* From 21511ce7f02b5e5ebafac27b790002707bd3570f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 21:38:32 -0700 Subject: [PATCH 20/58] Fix depcheck --- .github/workflows/depcheck.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/depcheck.yml b/.github/workflows/depcheck.yml index f8333408bb89..fbc8bdd359b9 100644 --- a/.github/workflows/depcheck.yml +++ b/.github/workflows/depcheck.yml @@ -9,6 +9,11 @@ on: type: string required: true description: Slug of os to test. + ci-python-version: + type: string + required: false + default: "3.11" + description: Python version the wofklow run should use env: COLUMNS: 190 @@ -241,6 +246,9 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + ci-python-version: ${{ inputs.ci-python-version }} + nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -259,10 +267,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -394,10 +402,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts From e673baddde723976d36865d4c1a2e5e8e3e846ff Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 8 Jul 2025 23:15:52 -0700 Subject: [PATCH 21/58] More fixes for depscheck workflow --- .github/workflows/ci.yml | 2 +- .github/workflows/depcheck.yml | 13 ++++++++----- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/layout.yml.jinja | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24c831eef3f4..92b30cfdbe4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-2 # Bump the number to invalidate all caches + CACHE_SEED: SEED-3 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/depcheck.yml b/.github/workflows/depcheck.yml index fbc8bdd359b9..a27de27a72e5 100644 --- a/.github/workflows/depcheck.yml +++ b/.github/workflows/depcheck.yml @@ -247,7 +247,6 @@ jobs: with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} - ci-python-version: ${{ inputs.ci-python-version }} nsis-tests: name: NSIS Tests @@ -256,6 +255,8 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + ci-python-version: ${{ inputs.ci-python-version }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" @@ -435,6 +436,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.0" python-version: "3.10.17" + ci-python-version: "${{ inputs.ci-python-version }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -450,6 +452,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.0" python-version: "3.10.17" + ci-python-version: "${{ inputs.ci-python-version }}" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -484,7 +487,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - ci-python-version: "3.11" + ci-python-version: "${{ inputs.ci-python-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -500,7 +503,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11" + ci-python-version: "${{ inputs.ci-python-version }}" 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.10.17 @@ -522,10 +525,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.11 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts id: python-tools-scripts diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index edfd2b30a793..4f1929573566 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-2 # Bump the number to invalidate all caches + CACHE_SEED: SEED-3 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2bfa4bc48678..b6093602ccf2 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,7 +12,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-2 # Bump the number to invalidate all caches + CACHE_SEED: SEED-3 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 067a67c00358..d00df3704b5b 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -41,7 +41,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-2 # Bump the number to invalidate all caches + CACHE_SEED: SEED-3 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index be48028d91c3..d3faa89721a0 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -38,7 +38,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-2 # Bump the number to invalidate all caches + CACHE_SEED: SEED-3 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" From ebc8bd4ce08065b03c68658653bd0ab85f989010 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 9 Jul 2025 01:12:12 -0700 Subject: [PATCH 22/58] Bump cache seed --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/layout.yml.jinja | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92b30cfdbe4d..f17a414eeb15 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-3 # Bump the number to invalidate all caches + CACHE_SEED: SEED-5 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4f1929573566..8c75f586e92f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-3 # Bump the number to invalidate all caches + CACHE_SEED: SEED-5 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index b6093602ccf2..9b25a8e314b3 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,7 +12,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-3 # Bump the number to invalidate all caches + CACHE_SEED: SEED-5 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index d00df3704b5b..3f7e1058a807 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -41,7 +41,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-3 # Bump the number to invalidate all caches + CACHE_SEED: SEED-5 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index d3faa89721a0..26d855badf1d 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -38,7 +38,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-3 # Bump the number to invalidate all caches + CACHE_SEED: SEED-5 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" From 19b8aecb1246ba2f673272e59d86536974353f9e Mon Sep 17 00:00:00 2001 From: DdangJin Date: Fri, 27 Jun 2025 14:11:33 +0900 Subject: [PATCH 23/58] Ensure _get_test_value returns only boolean values --- salt/modules/state.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/state.py b/salt/modules/state.py index 6440d347ffe0..f35992c7fd2a 100644 --- a/salt/modules/state.py +++ b/salt/modules/state.py @@ -488,8 +488,8 @@ def _get_test_value(test=None, **kwargs): ret = True else: ret = __opts__.get("test", None) - else: - ret = test + elif test is False: + ret = False return ret From 7e8ca6e765271c5e4f2bc3790e88a12a93e22767 Mon Sep 17 00:00:00 2001 From: DdangJin Date: Fri, 27 Jun 2025 17:39:19 +0900 Subject: [PATCH 24/58] Ensure "test" returns only boolean values --- salt/loader/lazy.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/salt/loader/lazy.py b/salt/loader/lazy.py index cb4424455cd5..41d5009835bc 100644 --- a/salt/loader/lazy.py +++ b/salt/loader/lazy.py @@ -152,7 +152,10 @@ def __call__(self, *args, **kwargs): if hasattr(mod, "__opts__"): if not isinstance(mod.__opts__, salt.loader.context.NamedLoaderContext): if "test" in self.loader.opts: - mod.__opts__["test"] = self.loader.opts["test"] + if self.loader.opts["test"] is False: + mod.__opts__["test"] = False + else: + mod.__opts__["test"] = True set_test = True if self.loader.inject_globals: run_func = global_injector_decorator(self.loader.inject_globals)(run_func) From 5448f3f2bce0ecf208f304ca0a10e8ee86f4307a Mon Sep 17 00:00:00 2001 From: DdangJin Date: Fri, 27 Jun 2025 20:42:46 +0900 Subject: [PATCH 25/58] Add tests for LazyLoader options and ensure test value is boolean --- tests/pytests/unit/loader/test_lazy.py | 23 ++++++++++++++++++ tests/pytests/unit/modules/test_state.py | 30 ++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/tests/pytests/unit/loader/test_lazy.py b/tests/pytests/unit/loader/test_lazy.py index 8e461b454b4e..a4ed7c4d5af8 100644 --- a/tests/pytests/unit/loader/test_lazy.py +++ b/tests/pytests/unit/loader/test_lazy.py @@ -27,6 +27,9 @@ def set_context(key, value): def get_context(key): return __context__[key] + + def get_opts(key): + return __opts__.get(key, None) """ with pytest.helpers.temp_file( "mod_a.py", directory=tmp_path, contents=mod_contents @@ -140,3 +143,23 @@ def test_loader_pack_opts_not_overwritten(loader_dir): assert "foo" not in loader.pack["__opts__"] assert "baz" in loader.pack["__opts__"] assert loader.pack["__opts__"]["baz"] == "bif" + + +@pytest.mark.parametrize( + "test_value, expected", + [ + (True, True), + (False, False), + ("abc", True), + (123, True), + ], +) +def test_loaded_func_ensures_test_boolean(loader_dir, test_value, expected): + """ + Functions loaded from LazyLoader's item lookups are LoadedFunc objects + """ + opts = {"optimization_order": [0, 1, 2], "test": test_value} + loader = salt.loader.lazy.LazyLoader([loader_dir], opts) + loaded_fun = loader["mod_a.get_opts"] + ret = loaded_fun("test") + assert ret is expected diff --git a/tests/pytests/unit/modules/test_state.py b/tests/pytests/unit/modules/test_state.py index ef54fa5a3324..6d045a13c24b 100644 --- a/tests/pytests/unit/modules/test_state.py +++ b/tests/pytests/unit/modules/test_state.py @@ -2,11 +2,22 @@ Unit tests for the salt.modules.state module """ +import pytest + import salt.loader.context -import salt.modules.state +import salt.modules.config as config +import salt.modules.state as state from tests.support.mock import patch +@pytest.fixture +def configure_loader_modules(): + return { + state: {"__salt__": {"config.get": config.get}, "__opts__": {"test": True}}, + config: {"__opts__": {}}, + } + + def test_get_initial_pillar(): """ _get_initial_pillar returns pillar data not named context @@ -17,5 +28,20 @@ def test_get_initial_pillar(): opts = {"__cli": "salt-call", "pillarenv": "base"} with patch("salt.modules.state.__pillar__", named_ctx, create=True): with patch("salt.modules.state.__opts__", opts, create=True): - pillar = salt.modules.state._get_initial_pillar(opts) + pillar = state._get_initial_pillar(opts) assert pillar == pillar_data + + +def test_check_test_value_is_boolean(): + """ + Ensure that the test value is always returned as a boolean + """ + with patch.dict(state.__opts__, {"test": True}, create=True): + assert state._get_test_value() is True + assert state._get_test_value(True) is True + assert state._get_test_value(False) is False + assert state._get_test_value("test") is True + assert state._get_test_value(123) is True + + with patch.dict(state.__opts__, {"test": False}, create=True): + assert state._get_test_value() is False From fc21663251fde8148a457d3ea66d8e0c3eb6eb67 Mon Sep 17 00:00:00 2001 From: DdangJin Date: Mon, 30 Jun 2025 02:20:17 +0900 Subject: [PATCH 26/58] Add changelog --- changelog/68121.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/68121.fixed.md diff --git a/changelog/68121.fixed.md b/changelog/68121.fixed.md new file mode 100644 index 000000000000..7b87e7ebe79d --- /dev/null +++ b/changelog/68121.fixed.md @@ -0,0 +1 @@ +Fix `test mode` causing unintended execution when non-boolean values are passed. From 3e0ae8d2b8568ded97f70e0f048b9316d8f47e79 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 9 Jul 2025 16:21:16 -0700 Subject: [PATCH 27/58] Add missing changelog --- changelog/68014.fixed.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelog/68014.fixed.md diff --git a/changelog/68014.fixed.md b/changelog/68014.fixed.md new file mode 100644 index 000000000000..e55b6ae02956 --- /dev/null +++ b/changelog/68014.fixed.md @@ -0,0 +1,5 @@ +Onedir packages include relenv 0.19.4. +- Update sqlite to 3500200 +- Update libffi to 3.5.1 +- Update python 3.13 to 3.13.5 +- Load default openssl modules when no system openssl binary exists From ded1ce9611b70065410ea82e791d5b24521129c5 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 10 Jul 2025 02:05:04 +0000 Subject: [PATCH 28/58] Release v3006.14 --- CHANGELOG.md | 14 +++++++++ changelog/68014.fixed.md | 5 ---- changelog/68107.fixed.md | 1 - changelog/68121.fixed.md | 1 - doc/man/salt-api.1 | 2 +- doc/man/salt-call.1 | 2 +- doc/man/salt-cloud.1 | 2 +- doc/man/salt-cp.1 | 2 +- doc/man/salt-key.1 | 2 +- doc/man/salt-master.1 | 2 +- doc/man/salt-minion.1 | 2 +- doc/man/salt-proxy.1 | 2 +- doc/man/salt-run.1 | 2 +- doc/man/salt-ssh.1 | 2 +- doc/man/salt-syndic.1 | 2 +- doc/man/salt.1 | 2 +- doc/man/spm.1 | 2 +- doc/topics/releases/3006.14.md | 29 +++++++++++++++++++ .../releases/templates/3006.14.md.template | 14 +++++++++ pkg/debian/changelog | 16 ++++++++++ pkg/rpm/salt.spec | 15 +++++++++- 21 files changed, 100 insertions(+), 21 deletions(-) delete mode 100644 changelog/68014.fixed.md delete mode 100644 changelog/68107.fixed.md delete mode 100644 changelog/68121.fixed.md create mode 100644 doc/topics/releases/3006.14.md create mode 100644 doc/topics/releases/templates/3006.14.md.template diff --git a/CHANGELOG.md b/CHANGELOG.md index adf32d0ed9dc..b70e69fabf6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,20 @@ Versions are `MAJOR.PATCH`. # Changelog +## 3006.14 (2025-07-10) + + +### Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + ## 3006.13 (2025-06-26) diff --git a/changelog/68014.fixed.md b/changelog/68014.fixed.md deleted file mode 100644 index e55b6ae02956..000000000000 --- a/changelog/68014.fixed.md +++ /dev/null @@ -1,5 +0,0 @@ -Onedir packages include relenv 0.19.4. -- Update sqlite to 3500200 -- Update libffi to 3.5.1 -- Update python 3.13 to 3.13.5 -- Load default openssl modules when no system openssl binary exists diff --git a/changelog/68107.fixed.md b/changelog/68107.fixed.md deleted file mode 100644 index ffd42b484acd..000000000000 --- a/changelog/68107.fixed.md +++ /dev/null @@ -1 +0,0 @@ -pkgrepo.managed not applying changes / account for 'name' attr being part of the state diff --git a/changelog/68121.fixed.md b/changelog/68121.fixed.md deleted file mode 100644 index 7b87e7ebe79d..000000000000 --- a/changelog/68121.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Fix `test mode` causing unintended execution when non-boolean values are passed. diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1 index 575f97cfbdfa..307343a3d241 100644 --- a/doc/man/salt-api.1 +++ b/doc/man/salt-api.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-API" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-API" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-api \- salt-api Command .sp diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1 index 23c5679eae8a..bc694bec30ef 100644 --- a/doc/man/salt-call.1 +++ b/doc/man/salt-call.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CALL" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-CALL" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-call \- salt-call Documentation .SH SYNOPSIS diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1 index c4b0f8c5b498..69ce8328fd93 100644 --- a/doc/man/salt-cloud.1 +++ b/doc/man/salt-cloud.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CLOUD" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-CLOUD" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-cloud \- Salt Cloud Command .sp diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1 index 2766a554a68e..2619d7efa1de 100644 --- a/doc/man/salt-cp.1 +++ b/doc/man/salt-cp.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CP" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-CP" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-cp \- salt-cp Documentation .sp diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1 index 4e5f27632c51..852e1a264fd4 100644 --- a/doc/man/salt-key.1 +++ b/doc/man/salt-key.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-KEY" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-KEY" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-key \- salt-key Documentation .SH SYNOPSIS diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1 index a37288d36b87..ccc8051854e5 100644 --- a/doc/man/salt-master.1 +++ b/doc/man/salt-master.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-MASTER" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-MASTER" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-master \- salt-master Documentation .sp diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1 index ce97980a1dd0..0110489aa64e 100644 --- a/doc/man/salt-minion.1 +++ b/doc/man/salt-minion.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-MINION" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-MINION" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-minion \- salt-minion Documentation .sp diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1 index 12e740f59106..15f6e5959068 100644 --- a/doc/man/salt-proxy.1 +++ b/doc/man/salt-proxy.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-PROXY" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-PROXY" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-proxy \- salt-proxy Documentation .sp diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1 index e467768b52a0..9abfc2dcc79c 100644 --- a/doc/man/salt-run.1 +++ b/doc/man/salt-run.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-RUN" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-RUN" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-run \- salt-run Documentation .sp diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1 index 58177ebe01bb..2d4f632780a2 100644 --- a/doc/man/salt-ssh.1 +++ b/doc/man/salt-ssh.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-SSH" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-SSH" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-ssh \- salt-ssh Documentation .SH SYNOPSIS diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1 index 0f430c78f1a1..b7c7542be039 100644 --- a/doc/man/salt-syndic.1 +++ b/doc/man/salt-syndic.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-SYNDIC" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT-SYNDIC" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt-syndic \- salt-syndic Documentation .sp diff --git a/doc/man/salt.1 b/doc/man/salt.1 index 869bb780ce5f..ac080ff9916f 100644 --- a/doc/man/salt.1 +++ b/doc/man/salt.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SALT" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME salt \- salt .SH SYNOPSIS diff --git a/doc/man/spm.1 b/doc/man/spm.1 index c79de6fb14cf..3128750cb333 100644 --- a/doc/man/spm.1 +++ b/doc/man/spm.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SPM" "1" "Generated on June 26, 2025 at 01:13:51 UTC." "3006.13" "Salt" +.TH "SPM" "1" "Generated on July 10, 2025 at 02:03:03 UTC." "3006.14" "Salt" .SH NAME spm \- Salt Package Manager Command .sp diff --git a/doc/topics/releases/3006.14.md b/doc/topics/releases/3006.14.md new file mode 100644 index 000000000000..062ab9c21bfa --- /dev/null +++ b/doc/topics/releases/3006.14.md @@ -0,0 +1,29 @@ +(release-3006.14)= +# Salt 3006.14 release notes + + + + + + + +## Changelog + +### Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) diff --git a/doc/topics/releases/templates/3006.14.md.template b/doc/topics/releases/templates/3006.14.md.template new file mode 100644 index 000000000000..72570c9e36e1 --- /dev/null +++ b/doc/topics/releases/templates/3006.14.md.template @@ -0,0 +1,14 @@ +(release-3006.14)= +# Salt 3006.14 release notes{{ unreleased }} +{{ warning }} + + + + +## Changelog +{{ changelog }} diff --git a/pkg/debian/changelog b/pkg/debian/changelog index 53c1cdf292af..efca93c5a893 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,19 @@ +salt (3006.14) stable; urgency=medium + + + # Fixed + + * Onedir packages include relenv 0.19.4. + * Update sqlite to 3500200 + * Update libffi to 3.5.1 + * Update python 3.13 to 3.13.5 + * Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) + * pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) + * Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + + -- Salt Project Packaging Thu, 10 Jul 2025 02:01:12 +0000 + salt (3006.13) stable; urgency=medium diff --git a/pkg/rpm/salt.spec b/pkg/rpm/salt.spec index b960d43aa0aa..adca343045f3 100644 --- a/pkg/rpm/salt.spec +++ b/pkg/rpm/salt.spec @@ -40,7 +40,7 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 3006.13 +Version: 3006.14 Release: 0 Summary: A parallel remote execution system Group: System Environment/Daemons @@ -734,6 +734,19 @@ if [ $1 -ge 1 ] ; then fi %changelog +* Thu Jul 10 2025 Salt Project Packaging - 3006.14 + +# Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + * Thu Jun 26 2025 Salt Project Packaging - 3006.13 # Fixed From b6bbdd773dbd003ecd673494c013bd5720208ed5 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 10 Jul 2025 04:30:22 -0700 Subject: [PATCH 29/58] Bump cache seed --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/layout.yml.jinja | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d47bd0e18e1..7a4c5f8e2137 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-6 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3f4416f31cd3..da2c0869c0f8 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-6 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 679b15829ac6..6abbf78756d3 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,7 +12,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-6 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b40ae687c3cf..eb2f2f425631 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -41,7 +41,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-6 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index a73e2a32af86..390b1a272830 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -38,7 +38,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-6 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" From a4670ac751eeb664ce764d69eb3fcd4f6f1699da Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 10 Jul 2025 10:23:28 -0700 Subject: [PATCH 30/58] Add changelogs from 3006.x --- changelog/68014.fixed.md | 5 +++++ changelog/68107.fixed.md | 1 + changelog/68121.fixed.md | 1 + 3 files changed, 7 insertions(+) create mode 100644 changelog/68014.fixed.md create mode 100644 changelog/68107.fixed.md create mode 100644 changelog/68121.fixed.md diff --git a/changelog/68014.fixed.md b/changelog/68014.fixed.md new file mode 100644 index 000000000000..e55b6ae02956 --- /dev/null +++ b/changelog/68014.fixed.md @@ -0,0 +1,5 @@ +Onedir packages include relenv 0.19.4. +- Update sqlite to 3500200 +- Update libffi to 3.5.1 +- Update python 3.13 to 3.13.5 +- Load default openssl modules when no system openssl binary exists diff --git a/changelog/68107.fixed.md b/changelog/68107.fixed.md new file mode 100644 index 000000000000..ffd42b484acd --- /dev/null +++ b/changelog/68107.fixed.md @@ -0,0 +1 @@ +pkgrepo.managed not applying changes / account for 'name' attr being part of the state diff --git a/changelog/68121.fixed.md b/changelog/68121.fixed.md new file mode 100644 index 000000000000..7b87e7ebe79d --- /dev/null +++ b/changelog/68121.fixed.md @@ -0,0 +1 @@ +Fix `test mode` causing unintended execution when non-boolean values are passed. From 634be4411cb46beb2245ad6300595519c0592f41 Mon Sep 17 00:00:00 2001 From: Salt Project Packaging Date: Thu, 10 Jul 2025 17:36:30 +0000 Subject: [PATCH 31/58] Release v3007.6 --- CHANGELOG.md | 14 +++++++++ changelog/68014.fixed.md | 5 ---- changelog/68107.fixed.md | 1 - changelog/68121.fixed.md | 1 - doc/man/salt-api.1 | 2 +- doc/man/salt-call.1 | 2 +- doc/man/salt-cloud.1 | 2 +- doc/man/salt-cp.1 | 2 +- doc/man/salt-key.1 | 2 +- doc/man/salt-master.1 | 2 +- doc/man/salt-minion.1 | 2 +- doc/man/salt-proxy.1 | 2 +- doc/man/salt-run.1 | 2 +- doc/man/salt-ssh.1 | 2 +- doc/man/salt-syndic.1 | 2 +- doc/man/salt.1 | 2 +- doc/man/spm.1 | 2 +- doc/topics/releases/3007.6.md | 29 +++++++++++++++++++ .../releases/templates/3007.6.md.template | 14 +++++++++ pkg/debian/changelog | 16 ++++++++++ pkg/rpm/salt.spec | 15 +++++++++- 21 files changed, 100 insertions(+), 21 deletions(-) delete mode 100644 changelog/68014.fixed.md delete mode 100644 changelog/68107.fixed.md delete mode 100644 changelog/68121.fixed.md create mode 100644 doc/topics/releases/3007.6.md create mode 100644 doc/topics/releases/templates/3007.6.md.template diff --git a/CHANGELOG.md b/CHANGELOG.md index 43f77ded8a7a..8efeffb358ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,20 @@ Versions are `MAJOR.PATCH`. # Changelog +## 3007.6 (2025-07-10) + + +### Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + ## 3007.5 (2025-06-26) ## 3006.14 (2025-07-10) diff --git a/changelog/68014.fixed.md b/changelog/68014.fixed.md deleted file mode 100644 index e55b6ae02956..000000000000 --- a/changelog/68014.fixed.md +++ /dev/null @@ -1,5 +0,0 @@ -Onedir packages include relenv 0.19.4. -- Update sqlite to 3500200 -- Update libffi to 3.5.1 -- Update python 3.13 to 3.13.5 -- Load default openssl modules when no system openssl binary exists diff --git a/changelog/68107.fixed.md b/changelog/68107.fixed.md deleted file mode 100644 index ffd42b484acd..000000000000 --- a/changelog/68107.fixed.md +++ /dev/null @@ -1 +0,0 @@ -pkgrepo.managed not applying changes / account for 'name' attr being part of the state diff --git a/changelog/68121.fixed.md b/changelog/68121.fixed.md deleted file mode 100644 index 7b87e7ebe79d..000000000000 --- a/changelog/68121.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Fix `test mode` causing unintended execution when non-boolean values are passed. diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1 index bcd70bd577b2..37e3a24fcced 100644 --- a/doc/man/salt-api.1 +++ b/doc/man/salt-api.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-API" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-API" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-api \- salt-api Command .sp diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1 index 3146fd3bb291..a811758bf444 100644 --- a/doc/man/salt-call.1 +++ b/doc/man/salt-call.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CALL" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-CALL" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-call \- salt-call Documentation .SH SYNOPSIS diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1 index 4ccd67bc9e2b..f70a990d76a8 100644 --- a/doc/man/salt-cloud.1 +++ b/doc/man/salt-cloud.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CLOUD" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-CLOUD" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-cloud \- Salt Cloud Command .sp diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1 index 270f06df41a5..07f12ace502f 100644 --- a/doc/man/salt-cp.1 +++ b/doc/man/salt-cp.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-CP" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-CP" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-cp \- salt-cp Documentation .sp diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1 index 0ccf4f02aa36..f330df87a54b 100644 --- a/doc/man/salt-key.1 +++ b/doc/man/salt-key.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-KEY" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-KEY" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-key \- salt-key Documentation .SH SYNOPSIS diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1 index be5b6efa557d..45ebe148b3e4 100644 --- a/doc/man/salt-master.1 +++ b/doc/man/salt-master.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-MASTER" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-MASTER" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-master \- salt-master Documentation .sp diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1 index bcd08c46ebd2..49ba2d1d6da8 100644 --- a/doc/man/salt-minion.1 +++ b/doc/man/salt-minion.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-MINION" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-MINION" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-minion \- salt-minion Documentation .sp diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1 index e7a51ce969dc..cbe28c2f74df 100644 --- a/doc/man/salt-proxy.1 +++ b/doc/man/salt-proxy.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-PROXY" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-PROXY" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-proxy \- salt-proxy Documentation .sp diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1 index 65d0c2e52bdc..f05d3210c307 100644 --- a/doc/man/salt-run.1 +++ b/doc/man/salt-run.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-RUN" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-RUN" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-run \- salt-run Documentation .sp diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1 index a7c88f164a94..cf74a6b10234 100644 --- a/doc/man/salt-ssh.1 +++ b/doc/man/salt-ssh.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-SSH" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-SSH" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-ssh \- salt-ssh Documentation .SH SYNOPSIS diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1 index 5338d59d677c..fa86d6423b24 100644 --- a/doc/man/salt-syndic.1 +++ b/doc/man/salt-syndic.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT-SYNDIC" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT-SYNDIC" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt-syndic \- salt-syndic Documentation .sp diff --git a/doc/man/salt.1 b/doc/man/salt.1 index fae222964efb..7e838b31a5d4 100644 --- a/doc/man/salt.1 +++ b/doc/man/salt.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SALT" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SALT" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME salt \- salt .SH SYNOPSIS diff --git a/doc/man/spm.1 b/doc/man/spm.1 index f37b940869df..1a51fffc7cad 100644 --- a/doc/man/spm.1 +++ b/doc/man/spm.1 @@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] .in \\n[rst2man-indent\\n[rst2man-indent-level]]u .. -.TH "SPM" "1" "Generated on June 26, 2025 at 18:24:26 UTC." "3007.5" "Salt" +.TH "SPM" "1" "Generated on July 10, 2025 at 17:34:48 UTC." "3007.6" "Salt" .SH NAME spm \- Salt Package Manager Command .sp diff --git a/doc/topics/releases/3007.6.md b/doc/topics/releases/3007.6.md new file mode 100644 index 000000000000..a9312a9ad724 --- /dev/null +++ b/doc/topics/releases/3007.6.md @@ -0,0 +1,29 @@ +(release-3007.6)= +# Salt 3007.6 release notes + + + + + + + +## Changelog + +### Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) diff --git a/doc/topics/releases/templates/3007.6.md.template b/doc/topics/releases/templates/3007.6.md.template new file mode 100644 index 000000000000..e45a743d16f5 --- /dev/null +++ b/doc/topics/releases/templates/3007.6.md.template @@ -0,0 +1,14 @@ +(release-3007.6)= +# Salt 3007.6 release notes{{ unreleased }} +{{ warning }} + + + + +## Changelog +{{ changelog }} diff --git a/pkg/debian/changelog b/pkg/debian/changelog index f9066f1352cc..eb240e40ff8c 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,19 @@ +salt (3007.6) stable; urgency=medium + + + # Fixed + + * Onedir packages include relenv 0.19.4. + * Update sqlite to 3500200 + * Update libffi to 3.5.1 + * Update python 3.13 to 3.13.5 + * Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) + * pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) + * Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + + -- Salt Project Packaging Thu, 10 Jul 2025 17:33:27 +0000 + salt (3006.14) stable; urgency=medium diff --git a/pkg/rpm/salt.spec b/pkg/rpm/salt.spec index 4640115d019d..2f9856d77b47 100644 --- a/pkg/rpm/salt.spec +++ b/pkg/rpm/salt.spec @@ -40,7 +40,7 @@ %define fish_dir %{_datadir}/fish/vendor_functions.d Name: salt -Version: 3007.5 +Version: 3007.6 Release: 0 Summary: A parallel remote execution system Group: System Environment/Daemons @@ -734,6 +734,19 @@ if [ $1 -ge 1 ] ; then fi %changelog +* Thu Jul 10 2025 Salt Project Packaging - 3007.6 + +# Fixed + +- Onedir packages include relenv 0.19.4. + - Update sqlite to 3500200 + - Update libffi to 3.5.1 + - Update python 3.13 to 3.13.5 + - Load default openssl modules when no system openssl binary exists [#68014](https://github.com/saltstack/salt/issues/68014) +- pkgrepo.managed not applying changes / account for 'name' attr being part of the state [#68107](https://github.com/saltstack/salt/issues/68107) +- Fix `test mode` causing unintended execution when non-boolean values are passed. [#68121](https://github.com/saltstack/salt/issues/68121) + + * Thu Jun 26 2025 Salt Project Packaging - 3007.5 # Fixed From 40dae30344cb1ebf572addcece359737c7283ae5 Mon Sep 17 00:00:00 2001 From: twangboy Date: Tue, 8 Jul 2025 09:08:09 -0600 Subject: [PATCH 32/58] Update werkzeug to 3.1.3 --- requirements/static/ci/common.in | 2 ++ requirements/static/ci/py3.10/cloud.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 3 ++- requirements/static/ci/py3.10/freebsd.txt | 3 ++- requirements/static/ci/py3.10/lint.txt | 3 ++- requirements/static/ci/py3.10/linux.txt | 3 ++- requirements/static/ci/py3.10/windows.txt | 3 ++- requirements/static/ci/py3.11/cloud.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 3 ++- requirements/static/ci/py3.11/freebsd.txt | 3 ++- requirements/static/ci/py3.11/lint.txt | 3 ++- requirements/static/ci/py3.11/linux.txt | 3 ++- requirements/static/ci/py3.11/windows.txt | 3 ++- requirements/static/ci/py3.12/cloud.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 3 ++- requirements/static/ci/py3.12/freebsd.txt | 3 ++- requirements/static/ci/py3.12/lint.txt | 3 ++- requirements/static/ci/py3.12/linux.txt | 3 ++- requirements/static/ci/py3.12/windows.txt | 3 ++- requirements/static/ci/py3.9/cloud.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 3 ++- requirements/static/ci/py3.9/freebsd.txt | 3 ++- requirements/static/ci/py3.9/lint.txt | 3 ++- requirements/static/ci/py3.9/linux.txt | 3 ++- requirements/static/ci/py3.9/windows.txt | 3 ++- 25 files changed, 50 insertions(+), 24 deletions(-) diff --git a/requirements/static/ci/common.in b/requirements/static/ci/common.in index 39b16b2e6560..2a9c9b320704 100644 --- a/requirements/static/ci/common.in +++ b/requirements/static/ci/common.in @@ -41,6 +41,8 @@ toml vcert~=0.7.0; sys_platform != 'win32' virtualenv>=20.3.0 watchdog>=0.9.0 +# werkzeug is a dependency of moto +werkzeug>=3.0.6 textfsm # Available template libraries that can be used genshi>=0.7.3 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index d87ea7c0e236..eccaa4e22e08 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -739,9 +739,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 720f6533aceb..12337cc71eba 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -519,8 +519,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index a248024e3688..63e63836c3a3 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -505,8 +505,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index 52ef84d49489..c92d0089139b 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -725,9 +725,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.10/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/static/ci/common.in # moto xmltodict==0.12.0 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 792ba4c61cec..2681ac1a7827 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -554,8 +554,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index 42917ea8fcb6..a8d37e1eadb7 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -488,8 +488,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver wheel==0.38.4 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 18b648632ce4..d92ec2c37911 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -686,9 +686,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index e5374b44a285..45621dcd515a 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -480,8 +480,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 3acae4e48583..05a2dd8f36f0 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -471,8 +471,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index a043db6dc1cc..053709d0baf2 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -671,9 +671,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.11/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/static/ci/common.in # moto xmltodict==0.12.0 # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 4559ba45bfe6..fc9f2f88f672 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -520,8 +520,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 30d18ada1371..5cd58ccf86df 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -482,8 +482,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver wheel==0.38.4 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index ebc0e349d3d1..b174a36f82bb 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -681,9 +681,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 44d56911fbd7..e3a34c632bb7 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -476,8 +476,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 5463abd29d56..6d501a59da12 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -467,8 +467,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index a7a382952214..8d62352084fd 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -666,9 +666,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/static/ci/common.in # moto xmltodict==0.12.0 # via diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 50b564dc94a7..7fc14103e082 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -516,8 +516,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 0605b2001612..7e3040e28d7c 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -478,8 +478,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver wheel==0.38.4 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index 9a478a4f9173..e04229b4243b 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -787,9 +787,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 5e642a027bbc..cf94c457bc5b 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -561,8 +561,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index ccb73eb65e91..09681c2733fa 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -547,8 +547,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 40ae52810316..82e3279a603a 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -757,9 +757,10 @@ wempy==0.2.1 # via # -c requirements/static/ci/py3.9/linux.txt # -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/static/ci/common.in # moto xmltodict==0.12.0 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 9d766d1f46aa..5762c341a67d 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -586,8 +586,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver xmltodict==0.12.0 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index eae18bfa3fe6..0356d0d62f51 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -494,8 +494,9 @@ websocket-client==0.40.0 # via kubernetes wempy==0.2.1 # via -r requirements/static/ci/common.in -werkzeug==3.0.3 +werkzeug==3.1.3 # via + # -r requirements/static/ci/common.in # moto # pytest-httpserver wheel==0.38.4 From cb70ab0e0b7aa20cb46d3c4c62b1a46bd8052f17 Mon Sep 17 00:00:00 2001 From: twangboy Date: Tue, 8 Jul 2025 09:49:00 -0600 Subject: [PATCH 33/58] Update immutables to 0.21 --- requirements/base.txt | 2 ++ requirements/static/ci/py3.10/cloud.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 3 ++- requirements/static/ci/py3.10/docs.txt | 3 ++- requirements/static/ci/py3.10/freebsd.txt | 3 ++- requirements/static/ci/py3.10/lint.txt | 3 ++- requirements/static/ci/py3.10/linux.txt | 3 ++- requirements/static/ci/py3.10/windows.txt | 3 ++- requirements/static/ci/py3.11/cloud.txt | 3 ++- requirements/static/ci/py3.11/darwin.txt | 3 ++- requirements/static/ci/py3.11/docs.txt | 3 ++- requirements/static/ci/py3.11/freebsd.txt | 3 ++- requirements/static/ci/py3.11/lint.txt | 3 ++- requirements/static/ci/py3.11/linux.txt | 3 ++- requirements/static/ci/py3.11/windows.txt | 3 ++- requirements/static/ci/py3.12/cloud.txt | 3 ++- requirements/static/ci/py3.12/darwin.txt | 3 ++- requirements/static/ci/py3.12/docs.txt | 3 ++- requirements/static/ci/py3.12/freebsd.txt | 3 ++- requirements/static/ci/py3.12/lint.txt | 3 ++- requirements/static/ci/py3.12/linux.txt | 3 ++- requirements/static/ci/py3.12/windows.txt | 3 ++- requirements/static/ci/py3.9/cloud.txt | 3 ++- requirements/static/ci/py3.9/darwin.txt | 3 ++- requirements/static/ci/py3.9/docs.txt | 3 ++- requirements/static/ci/py3.9/freebsd.txt | 3 ++- requirements/static/ci/py3.9/lint.txt | 3 ++- requirements/static/ci/py3.9/linux.txt | 3 ++- requirements/static/ci/py3.9/windows.txt | 3 ++- requirements/static/pkg/py3.10/darwin.txt | 6 ++++-- requirements/static/pkg/py3.10/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.10/linux.txt | 6 ++++-- requirements/static/pkg/py3.10/windows.txt | 6 ++++-- requirements/static/pkg/py3.11/darwin.txt | 6 ++++-- requirements/static/pkg/py3.11/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.11/linux.txt | 6 ++++-- requirements/static/pkg/py3.11/windows.txt | 6 ++++-- requirements/static/pkg/py3.12/darwin.txt | 6 ++++-- requirements/static/pkg/py3.12/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.12/linux.txt | 6 ++++-- requirements/static/pkg/py3.12/windows.txt | 6 ++++-- requirements/static/pkg/py3.9/darwin.txt | 6 ++++-- requirements/static/pkg/py3.9/freebsd.txt | 6 ++++-- requirements/static/pkg/py3.9/linux.txt | 6 ++++-- requirements/static/pkg/py3.9/windows.txt | 6 ++++-- 45 files changed, 122 insertions(+), 60 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f79ae6feb1d0..0c18a869fc1c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,6 +19,8 @@ looseversion croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' # We need contextvars for salt-ssh contextvars +# immutables is a requirement of contextvars +immutables>=0.21 cryptography>=42.0.0 urllib3>=1.26.20,<2.0.0; python_version < '3.10' urllib3>=2.5.0; python_version >= '3.10' diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index eccaa4e22e08..7ba9f019aa02 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -220,10 +220,11 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 12337cc71eba..c4b5ef072201 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -160,9 +160,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index 1bdd5285ce39..e6b0f6c2ae7e 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -61,9 +61,10 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # contextvars jaraco.classes==3.2.1 # via diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 63e63836c3a3..76d1337dac33 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -153,9 +153,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index c92d0089139b..7af1c0115839 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -225,10 +225,11 @@ idna==3.7 # etcd3-py # requests # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -c requirements/static/ci/py3.10/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index 2681ac1a7827..f0f631628fbc 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -162,9 +162,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index a8d37e1eadb7..e9da94c5dd42 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -147,9 +147,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.10/windows.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index d92ec2c37911..123f03d33443 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -212,10 +212,11 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index 45621dcd515a..3496922655f8 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -153,9 +153,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 77d058a1a697..136ba33a0fa2 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -61,9 +61,10 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # contextvars jaraco.classes==3.2.1 # via diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index 05a2dd8f36f0..3b6a8b23581b 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -149,9 +149,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index 053709d0baf2..da034a93a046 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -221,10 +221,11 @@ idna==3.7 # etcd3-py # requests # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -c requirements/static/ci/py3.11/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index fc9f2f88f672..721ead1c4b78 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -158,9 +158,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 5cd58ccf86df..47b21820bd24 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -143,9 +143,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.11/windows.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index b174a36f82bb..7e4fedbd32c8 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -207,10 +207,11 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index e3a34c632bb7..dc898613e616 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -149,9 +149,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index da2e3f338b53..310bba03f7eb 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -57,9 +57,10 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # contextvars jaraco.classes==3.2.1 # via diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 6d501a59da12..fad504bf8899 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -145,9 +145,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index 8d62352084fd..2d0e56f46006 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -216,10 +216,11 @@ idna==3.7 # etcd3-py # requests # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 7fc14103e082..9fd21ec4e175 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -154,9 +154,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 7e3040e28d7c..8f9469df62e0 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -139,9 +139,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.12/windows.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index e04229b4243b..ffcb9fe492cc 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -231,10 +231,11 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index cf94c457bc5b..a06093bc4764 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -168,9 +168,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 9eef87a513d7..46cf7b22044b 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -61,9 +61,10 @@ idna==3.7 # requests imagesize==1.4.1 # via sphinx -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 09681c2733fa..1b24123a632c 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -161,9 +161,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 82e3279a603a..648400cc4e98 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -227,10 +227,11 @@ idna==3.7 # etcd3-py # requests # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -c requirements/static/ci/py3.9/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 5762c341a67d..0c9d96e56829 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -165,9 +165,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/linux.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 0356d0d62f51..00fd2c58eda6 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -149,9 +149,10 @@ idna==3.7 # requests # trustme # yarl -immutables==0.15 +immutables==0.21 # via # -c requirements/static/ci/../pkg/py3.9/windows.txt + # -r requirements/base.txt # contextvars importlib-metadata==6.0.0 # via diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 98e3c0694034..0c4f2e485ef2 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -40,8 +40,10 @@ idna==3.7 # via # -r requirements/darwin.txt # requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/darwin.txt jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 91d9b45ca95e..71b9ecb06ca7 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -35,8 +35,10 @@ distro==1.5.0 # -r requirements/static/pkg/freebsd.in idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/freebsd.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 0ac74ad8f8a2..21367e96b562 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -33,8 +33,10 @@ distro==1.5.0 # via -r requirements/base.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/linux.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index d94777420711..e2d6f7025e67 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -39,8 +39,10 @@ gitpython==3.1.41 # via -r requirements/windows.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/windows.txt ioloop==0.1a0 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index da85662ae776..45c914e3bb6e 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -40,8 +40,10 @@ idna==3.7 # via # -r requirements/darwin.txt # requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/darwin.txt jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 13a8727d7e07..cdef9c8cc2b6 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -35,8 +35,10 @@ distro==1.5.0 # -r requirements/static/pkg/freebsd.in idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/freebsd.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index e65a12c9788a..018eb38d345a 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -33,8 +33,10 @@ distro==1.5.0 # via -r requirements/base.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/linux.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 5aa29fb1e244..6d88c145095e 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -39,8 +39,10 @@ gitpython==3.1.41 # via -r requirements/windows.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/windows.txt ioloop==0.1a0 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 8732f1bc7d99..650743a506a5 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -38,8 +38,10 @@ idna==3.7 # via # -r requirements/darwin.txt # requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/darwin.txt jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 529a1aa5f10f..ac23ce8288c8 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -33,8 +33,10 @@ distro==1.5.0 # -r requirements/static/pkg/freebsd.in idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/freebsd.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 41609290e38b..311f344980e7 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -31,8 +31,10 @@ distro==1.5.0 # via -r requirements/base.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/linux.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index fa0531d413e9..e7f2d7595c61 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -37,8 +37,10 @@ gitpython==3.1.41 # via -r requirements/windows.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/windows.txt ioloop==0.1a0 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 13c99c702cb7..15ca4c1c8cee 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -40,8 +40,10 @@ idna==3.7 # via # -r requirements/darwin.txt # requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/darwin.txt jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index 111608cf971e..7d894250ed39 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -35,8 +35,10 @@ distro==1.5.0 # -r requirements/static/pkg/freebsd.in idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/freebsd.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index 8ab547054d8b..f386562daa11 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -33,8 +33,10 @@ distro==1.5.0 # via -r requirements/base.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/static/pkg/linux.in jaraco.classes==3.2.1 diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index 1eac1fc350ca..758fdfc35752 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -39,8 +39,10 @@ gitpython==3.1.41 # via -r requirements/windows.txt idna==3.7 # via requests -immutables==0.15 - # via contextvars +immutables==0.21 + # via + # -r requirements/base.txt + # contextvars importlib-metadata==6.0.0 # via -r requirements/windows.txt ioloop==0.1a0 From a22138303d65f688ae0dd7e25c7e38bed727490c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 10 Jul 2025 17:22:24 -0700 Subject: [PATCH 34/58] Fix merge wart --- .github/workflows/build-deps-ci-action.yml | 26 +++++++------- .github/workflows/build-docs.yml | 2 +- .github/workflows/build-packages.yml | 8 +++-- .github/workflows/build-salt-onedir.yml | 14 +++++--- .github/workflows/depcheck.yml | 34 +++++++++++++------ .github/workflows/lint-action.yml | 12 ++++--- .github/workflows/nsis-tests.yml | 21 ++++++++---- .github/workflows/release-update-winrepo.yml | 10 ++++-- .../workflows/release-upload-virustotal.yml | 11 ++++-- .github/workflows/ssh-debug.yml | 10 ++++-- .github/workflows/test-action.yml | 34 ++++++++----------- .github/workflows/test-packages-action.yml | 19 +++++------ 12 files changed, 125 insertions(+), 76 deletions(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 5ccabd6d8220..767cbaf6f30d 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -27,8 +27,13 @@ on: python-version: required: false type: string - description: The python version to run tests with - default: "3.10" + description: The python version bundled with Salt + default: "3.11" + ci-python-version: + required: false + type: string + description: The python version used by workflows + default: "3.11" package-name: required: false type: string @@ -69,9 +74,10 @@ jobs: matrix: include: ${{ fromJSON(inputs.matrix)['linux'] }} steps: - - uses: actions/setup-python@v5 + - name: Setup Python Version ${{ inputs.ci-python-version }} + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: "Throttle Builds" shell: bash @@ -81,10 +87,6 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: - python-version: '3.10' - - name: Cache nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }} id: nox-dependencies-cache uses: ./.github/actions/cache @@ -196,11 +198,11 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-macos-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install System Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' @@ -289,11 +291,11 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 3372769516a8..a7b9683e5c63 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.11' - name: Download Release Patch if: ${{ startsWith(github.event.ref, 'refs/tags') == false }} diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 22b584cf559b..76f82095796b 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -16,6 +16,10 @@ on: required: true type: string description: The version of python to use with relenv + ci-python-version: + required: true + type: string + description: The version of python to use in workflows sign-rpm-packages: type: boolean default: false @@ -301,7 +305,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -424,7 +428,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 39c5578eb0bb..149c791bb1ae 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -20,6 +20,10 @@ on: required: true type: string description: The version of python to use with relenv + ci-python-version: + required: true + type: string + description: The version of python in workflows matrix: type: string required: true @@ -64,7 +68,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -120,10 +124,10 @@ jobs: t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t" - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -176,10 +180,10 @@ jobs: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/depcheck.yml b/.github/workflows/depcheck.yml index 955b6cb6fb8b..a27de27a72e5 100644 --- a/.github/workflows/depcheck.yml +++ b/.github/workflows/depcheck.yml @@ -9,6 +9,11 @@ on: type: string required: true description: Slug of os to test. + ci-python-version: + type: string + required: false + default: "3.11" + description: Python version the wofklow run should use env: COLUMNS: 190 @@ -136,10 +141,10 @@ jobs: - *tests_added_modified - *pkg_tests_added_modified - - name: Set up Python 3.10 + - name: Set up Python 3.11 uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -241,6 +246,8 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} + nsis-tests: name: NSIS Tests uses: ./.github/workflows/nsis-tests.yml @@ -248,6 +255,8 @@ jobs: - prepare-workflow with: changed-files: ${{ needs.prepare-workflow.outputs.changed-files }} + ci-python-version: ${{ inputs.ci-python-version }} + full: ${{ fromJSON(needs.prepare-workflow.outputs.config)['testrun']['type'] == 'full' }} prepare-release: name: "Prepare Release: ${{ needs.prepare-workflow.outputs.salt-version }}" @@ -259,10 +268,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -394,10 +403,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -427,6 +436,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.19.0" python-version: "3.10.17" + ci-python-version: "${{ inputs.ci-python-version }}" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -442,6 +452,7 @@ jobs: cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.19.0" python-version: "3.10.17" + ci-python-version: "${{ inputs.ci-python-version }}" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }} @@ -456,7 +467,8 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + python-version: "3.10.17" + ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}" @@ -475,7 +487,7 @@ jobs: nox-session: ci-test-onedir salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" nox-version: 2022.8.7 - python-version: "3.10" + ci-python-version: "${{ inputs.ci-python-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} @@ -491,7 +503,7 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10" + ci-python-version: "${{ inputs.ci-python-version }}" 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.10.17 @@ -513,10 +525,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts id: python-tools-scripts diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml index 09f614fbf36c..d53b0b7631ea 100644 --- a/.github/workflows/lint-action.yml +++ b/.github/workflows/lint-action.yml @@ -8,6 +8,10 @@ on: required: true type: string description: JSON string containing information about changed files + full: + required: true + type: boolean + description: When this is true lint will run against all files env: @@ -19,7 +23,7 @@ jobs: Salt: name: Lint Salt's Source Code runs-on: ubuntu-22.04 - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }} container: image: ghcr.io/saltstack/salt-ci-containers/python:3.10 @@ -49,7 +53,7 @@ jobs: nox --forcecolor -e lint-salt -- ${{ join(fromJSON(inputs.changed-files)['salt_files'], ' ') }} - name: Lint ALL Files - if: github.event_name != 'pull_request' || fromJSON(inputs.changed-files)['lint'] + if: inputs.full || fromJSON(inputs.changed-files)['lint'] env: SKIP_REQUIREMENTS_INSTALL: YES run: | @@ -59,7 +63,7 @@ jobs: Tests: name: Lint Salt's Test Suite runs-on: ubuntu-22.04 - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }} container: image: ghcr.io/saltstack/salt-ci-containers/python:3.10 @@ -89,7 +93,7 @@ jobs: nox --forcecolor -e lint-tests -- ${{ join(fromJSON(inputs.changed-files)['tests_files'], ' ') }} - name: Lint ALL Files - if: github.event_name != 'pull_request' || fromJSON(inputs.changed-files)['lint'] + if: inputs.full || fromJSON(inputs.changed-files)['lint'] env: SKIP_REQUIREMENTS_INSTALL: YES run: | diff --git a/.github/workflows/nsis-tests.yml b/.github/workflows/nsis-tests.yml index e80ed43f4099..2ab93755cab9 100644 --- a/.github/workflows/nsis-tests.yml +++ b/.github/workflows/nsis-tests.yml @@ -8,23 +8,32 @@ on: required: true type: string description: JSON string containing information about changed files + full: + required: true + type: boolean + description: Is this a full testrun or not + ci-python-version: + required: true + type: string + description: The version of python to use for the workflow run + jobs: Test-NSIS-Logic: name: Logic Tests runs-on: - windows-latest - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} steps: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Install NSIS run: .\pkg\windows\install_nsis.cmd -CICD @@ -42,17 +51,17 @@ jobs: name: Stress Tests runs-on: - windows-latest - if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} + if: ${{ inputs.full || contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['nsis_tests'] }} steps: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Install NSIS run: .\pkg\windows\install_nsis.cmd -CICD diff --git a/.github/workflows/release-update-winrepo.yml b/.github/workflows/release-update-winrepo.yml index 0290a60d652e..e520d36ffbe8 100644 --- a/.github/workflows/release-update-winrepo.yml +++ b/.github/workflows/release-update-winrepo.yml @@ -12,6 +12,12 @@ on: description: > The Salt version to set prior to building packages and staging the release. (DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0). + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run permissions: contents: read @@ -33,10 +39,10 @@ jobs: path: winrepo repository: saltstack/salt-winrepo-ng - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Add Version to Minion Definition File working-directory: salt diff --git a/.github/workflows/release-upload-virustotal.yml b/.github/workflows/release-upload-virustotal.yml index dc760371bb21..41c3dfb5444a 100644 --- a/.github/workflows/release-upload-virustotal.yml +++ b/.github/workflows/release-upload-virustotal.yml @@ -12,6 +12,12 @@ on: description: > The Salt version to get from staging to upload to VirusTotal. (DO NOT prefix the version with a v, ie, 3006.0 NOT v3006.0). + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run permissions: contents: read @@ -36,10 +42,11 @@ jobs: - name: Checkout Salt uses: actions/checkout@v4 - - name: Set Up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" + - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/ssh-debug.yml b/.github/workflows/ssh-debug.yml index 992f6b6a7b2d..8f34f5f6a97e 100644 --- a/.github/workflows/ssh-debug.yml +++ b/.github/workflows/ssh-debug.yml @@ -20,6 +20,12 @@ on: type: boolean default: false description: Run sshd with debug enabled. + ci-python-version: + type: string + required: false + default: "3.11" + description: > + Python version to use for workflow run @@ -33,10 +39,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Set up Python 3.10 + - name: Set Up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 7bef19bf1894..6afa916e7e25 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -12,11 +12,10 @@ on: required: true type: string description: JSON string containing information about what and how to run the test suite - python-version: - required: false + ci-python-version: + required: true type: string description: The python version to run tests with - default: "3.10" salt-version: type: string required: true @@ -94,10 +93,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -406,10 +405,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -722,10 +721,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Salt Version run: | @@ -988,9 +987,11 @@ jobs: matrix: include: ${{ fromJSON(inputs.matrix)['windows'] }} steps: - - uses: actions/setup-python@v5 + + - name: Setup Python ${{ inputs.ci-python-version }} + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: ${{ inputs.ci-python-version }} - name: "Throttle Builds" shell: bash @@ -1026,11 +1027,6 @@ jobs: run: | echo true - - name: Setup Python ${{ inputs.python-version }} - uses: actions/setup-python@v5 - with: - python-version: "${{ inputs.python-version }}" - - name: Install Nox run: | python3 -m pip install 'nox==${{ inputs.nox-version }}' @@ -1295,7 +1291,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: "${{ inputs.ci-python-version }}" - name: "Throttle Builds" shell: bash @@ -1344,10 +1340,10 @@ jobs: run: | tree -a artifacts - - name: Setup Python ${{ inputs.python-version }} + - name: Setup Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install Nox run: | diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index 4fe08cec3c23..af171efdb3e2 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -20,11 +20,10 @@ on: required: true type: string description: The nox version to install - python-version: - required: false + ci-python-version: + required: true type: string description: The python version to run tests with - default: "3.10" nox-session: required: false type: string @@ -86,10 +85,10 @@ jobs: - name: Checkout Source Code uses: actions/checkout@v4 - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Setup Python Tools Scripts uses: ./.github/actions/setup-python-tools-scripts @@ -221,7 +220,7 @@ jobs: - name: Install System Dependencies run: | - brew install tree pkg-config mysql + brew install tree - name: List Packages run: | @@ -240,10 +239,10 @@ jobs: cd artifacts tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ matrix.platform }}-${{ matrix.arch }}.tar.xz - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: Install Nox run: | @@ -327,10 +326,10 @@ jobs: include: ${{ fromJSON(inputs.matrix)['windows'] }} steps: - - name: Set up Python ${{ inputs.python-version }} + - name: Set up Python ${{ inputs.ci-python-version }} uses: actions/setup-python@v5 with: - python-version: "${{ inputs.python-version }}" + python-version: "${{ inputs.ci-python-version }}" - name: "Throttle Builds" shell: bash From 48c7d58a84a7ce624d70ab135759a3a230dc36ed Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 15 Jul 2025 15:39:20 -0700 Subject: [PATCH 35/58] Bump relenv version to 0.20.0 --- .github/workflows/ci.yml | 16 ++++++++-------- .github/workflows/nightly.yml | 20 ++++++++++---------- .github/workflows/scheduled.yml | 16 ++++++++-------- .github/workflows/staging.yml | 20 ++++++++++---------- cicd/shared-gh-workflows-context.yml | 4 ++-- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f17a414eeb15..52d3db78b772 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -416,8 +416,8 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" 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'] }} @@ -432,8 +432,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -448,10 +448,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10.17" + python-version: "3.10.18" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 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'] }} @@ -468,7 +468,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 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']) }} @@ -486,7 +486,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} workflow-slug: ci default-timeout: 180 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 8c75f586e92f..5dca7dc3193c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -466,8 +466,8 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" 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,8 +482,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -503,8 +503,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -523,10 +523,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10.17" + python-version: "3.10.18" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 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'] }} @@ -543,7 +543,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -561,7 +561,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true workflow-slug: nightly default-timeout: 360 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 9b25a8e314b3..2b8a425daa87 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -451,8 +451,8 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" 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'] }} @@ -467,8 +467,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -483,10 +483,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10.17" + python-version: "3.10.18" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 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'] }} @@ -503,7 +503,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -521,7 +521,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true workflow-slug: scheduled default-timeout: 360 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 3f7e1058a807..8e414f084896 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -447,8 +447,8 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" 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'] }} @@ -464,8 +464,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -486,8 +486,8 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.19.4" - python-version: "3.10.17" + relenv-version: "0.20.0" + python-version: "3.10.18" ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -506,10 +506,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.10.17" + python-version: "3.10.18" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 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'] }} @@ -526,7 +526,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -544,7 +544,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.10.17 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.18 skip-code-coverage: true workflow-slug: staging default-timeout: 180 diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 964e1db0cd99..3aa814feb061 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,6 +1,6 @@ nox_version: "2022.8.7" -python_version: "3.10.17" -relenv_version: "0.19.4" +python_version: "3.10.18" +relenv_version: "0.20.0" pr-testrun-slugs: - ubuntu-24.04-pkg - ubuntu-24.04 From bbc545f8b7634f54f8a6635aa7da618a79e7ae47 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 15 Jul 2025 16:11:39 -0700 Subject: [PATCH 36/58] No longer run toolchain fetch --- .github/actions/setup-relenv/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/setup-relenv/action.yml b/.github/actions/setup-relenv/action.yml index 350d7dd302f7..f3f1cc15d136 100644 --- a/.github/actions/setup-relenv/action.yml +++ b/.github/actions/setup-relenv/action.yml @@ -49,7 +49,6 @@ runs: RELENV_FETCH_VERSION: "${{ inputs.version }}" run: | python3 -m pip install relenv[toolchain] - python3 -m relenv toolchain fetch --arch=${{ inputs.arch }} - name: Fetch Native Python Build shell: bash From 39a7bcf32d9188a2171923bab688f555c44751e1 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 15 Jul 2025 16:53:03 -0700 Subject: [PATCH 37/58] Install ppbt when building onedir deps --- noxfile.py | 2 +- tools/pkg/build.py | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 27bbae57dd19..fdd7e4147d1b 100644 --- a/noxfile.py +++ b/noxfile.py @@ -283,7 +283,7 @@ def _install_requirements( onedir=False, ): if onedir and IS_LINUX: - session_run_always(session, "python3", "-m", "relenv", "toolchain", "fetch") + session_run_always(session, "python3", "-m", "pip", "install", "ppbt") if not _upgrade_pip_setuptools_and_wheel(session): return False diff --git a/tools/pkg/build.py b/tools/pkg/build.py index 447096daebae..7a51bd96900c 100644 --- a/tools/pkg/build.py +++ b/tools/pkg/build.py @@ -573,6 +573,15 @@ def onedir_dependencies( if platform == "macos": env["OPENSSL_DIR"] = f"{dest}" + if platform == "linux": + ctx.run( + str(python_bin), + "-m", + "pip", + "install", + "ppbt", + ) + version_info = ctx.run( str(python_bin), "-c", From 0d5a9a21da8fe40369cde8397d4a5f0bd5be5b42 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 15 Jul 2025 18:03:46 -0700 Subject: [PATCH 38/58] Debug build --- tools/__init__.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tools/__init__.py b/tools/__init__.py index caa81ca6a074..54f3d26e9b20 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -1,10 +1,56 @@ +import json import logging import pathlib import sys import ptscripts +import ptscripts.virtualenv from ptscripts.models import DefaultPipConfig, VirtualEnvPipConfig + +def _add_as_extra_site_packages(self) -> None: + if self.config.add_as_extra_site_packages is False: + return + ret = self.run_code( + "import json,site; print(json.dumps(site.getsitepackages()))", + capture=True, + check=False, + ) + if ret.returncode: + self.ctx.error( + f"1 Failed to get the virtualenv's site packages path: {ret.stdout.decode()} {ret.stderr.decode()}" + ) + self.ctx.exit(1) + for path in json.loads(ret.stdout.strip().decode()): + if path not in sys.path: + sys.path.append(path) + + +def _remove_extra_site_packages(self) -> None: + if self.config.add_as_extra_site_packages is False: + return + ret = self.run_code( + "import json,site; print(json.dumps(site.getsitepackages()))", + capture=True, + check=False, + ) + if ret.returncode: + self.ctx.error( + f"2 Failed to get the virtualenv's site packages path: {ret.stdout.decode()} {ret.stderr.decode()}" + ) + self.ctx.exit(1) + for path in json.loads(ret.stdout.strip().decode()): + if path in sys.path: + sys.path.remove(path) + + +ptscripts.virtualenv.VirtualEnv._add_as_extra_site_packages = ( + _add_as_extra_site_packages +) +ptscripts.virtualenv.VirtualEnv._remove_extra_site_packages = ( + _remove_extra_site_packages +) + REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REQUIREMENTS_FILES_PATH = REPO_ROOT / "requirements" STATIC_REQUIREMENTS_PATH = REQUIREMENTS_FILES_PATH / "static" From 8c7fe99e5a247bb3b35d434c5a081ecd4fad665a Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Tue, 15 Jul 2025 21:28:16 -0700 Subject: [PATCH 39/58] more debug --- tools/__init__.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/tools/__init__.py b/tools/__init__.py index 54f3d26e9b20..01f526f2b396 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -2,6 +2,8 @@ import logging import pathlib import sys +import textwrap +from subprocess import CompletedProcess import ptscripts import ptscripts.virtualenv @@ -18,7 +20,7 @@ def _add_as_extra_site_packages(self) -> None: ) if ret.returncode: self.ctx.error( - f"1 Failed to get the virtualenv's site packages path: {ret.stdout.decode()} {ret.stderr.decode()}" + f"1 Failed to get the virtualenv's site packages path: {ret.returncode} {ret.stdout.decode()} {ret.stderr.decode()}" ) self.ctx.exit(1) for path in json.loads(ret.stdout.strip().decode()): @@ -44,12 +46,29 @@ def _remove_extra_site_packages(self) -> None: sys.path.remove(path) +def run_code( + self, code_string: str, python: str | None = None, **kwargs +) -> CompletedProcess[bytes]: + """ + Run a code string against the virtual environment. + """ + if code_string.startswith("\n"): + code_string = code_string[1:] + code_string = textwrap.dedent(code_string).rstrip() + # log.debug("Code to run passed to python:\n>>>>>>>>>>\n%s\n<<<<<<<<<<", code_string) + self.ctx.info(f"Python iterpreter {self.venv_python}") + if python is None: + python = str(self.venv_python) + return self.run(python, "-c", code_string, **kwargs) + + ptscripts.virtualenv.VirtualEnv._add_as_extra_site_packages = ( _add_as_extra_site_packages ) ptscripts.virtualenv.VirtualEnv._remove_extra_site_packages = ( _remove_extra_site_packages ) +ptscripts.virtualenv.VirtualEnv.run_code = run_code REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REQUIREMENTS_FILES_PATH = REPO_ROOT / "requirements" From 0b83962b7e23d9447d0fcb74ff7d672e760dffdc Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 02:27:17 -0700 Subject: [PATCH 40/58] Monkey patch ptscripts to debug workflow --- tools/__init__.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/__init__.py b/tools/__init__.py index 01f526f2b396..88d3b37ae2e3 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -3,6 +3,7 @@ import pathlib import sys import textwrap +import time from subprocess import CompletedProcess import ptscripts @@ -18,6 +19,14 @@ def _add_as_extra_site_packages(self) -> None: capture=True, check=False, ) + if ret.returncode == 3221225595: + self.ctx.info("Failed once!") + time.sleep(1) + ret = self.run_code( + "import json,site; print(json.dumps(site.getsitepackages()))", + capture=True, + check=False, + ) if ret.returncode: self.ctx.error( f"1 Failed to get the virtualenv's site packages path: {ret.returncode} {ret.stdout.decode()} {ret.stderr.decode()}" @@ -111,7 +120,6 @@ def run_code( ptscripts.register_tools_module("tools.release", venv_config=RELEASE_VENV_CONFIG) ptscripts.register_tools_module("tools.testsuite") ptscripts.register_tools_module("tools.testsuite.download") -ptscripts.register_tools_module("tools.vm") for name in ("boto3", "botocore", "urllib3"): logging.getLogger(name).setLevel(logging.INFO) From c014440b4f5d3e4c52b4184a4c401e0fdd1994dc Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 14:46:04 -0700 Subject: [PATCH 41/58] Remove monkey patching --- tools/__init__.py | 72 ----------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/tools/__init__.py b/tools/__init__.py index 88d3b37ae2e3..35605f340e70 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -3,82 +3,10 @@ import pathlib import sys import textwrap -import time -from subprocess import CompletedProcess import ptscripts -import ptscripts.virtualenv from ptscripts.models import DefaultPipConfig, VirtualEnvPipConfig - -def _add_as_extra_site_packages(self) -> None: - if self.config.add_as_extra_site_packages is False: - return - ret = self.run_code( - "import json,site; print(json.dumps(site.getsitepackages()))", - capture=True, - check=False, - ) - if ret.returncode == 3221225595: - self.ctx.info("Failed once!") - time.sleep(1) - ret = self.run_code( - "import json,site; print(json.dumps(site.getsitepackages()))", - capture=True, - check=False, - ) - if ret.returncode: - self.ctx.error( - f"1 Failed to get the virtualenv's site packages path: {ret.returncode} {ret.stdout.decode()} {ret.stderr.decode()}" - ) - self.ctx.exit(1) - for path in json.loads(ret.stdout.strip().decode()): - if path not in sys.path: - sys.path.append(path) - - -def _remove_extra_site_packages(self) -> None: - if self.config.add_as_extra_site_packages is False: - return - ret = self.run_code( - "import json,site; print(json.dumps(site.getsitepackages()))", - capture=True, - check=False, - ) - if ret.returncode: - self.ctx.error( - f"2 Failed to get the virtualenv's site packages path: {ret.stdout.decode()} {ret.stderr.decode()}" - ) - self.ctx.exit(1) - for path in json.loads(ret.stdout.strip().decode()): - if path in sys.path: - sys.path.remove(path) - - -def run_code( - self, code_string: str, python: str | None = None, **kwargs -) -> CompletedProcess[bytes]: - """ - Run a code string against the virtual environment. - """ - if code_string.startswith("\n"): - code_string = code_string[1:] - code_string = textwrap.dedent(code_string).rstrip() - # log.debug("Code to run passed to python:\n>>>>>>>>>>\n%s\n<<<<<<<<<<", code_string) - self.ctx.info(f"Python iterpreter {self.venv_python}") - if python is None: - python = str(self.venv_python) - return self.run(python, "-c", code_string, **kwargs) - - -ptscripts.virtualenv.VirtualEnv._add_as_extra_site_packages = ( - _add_as_extra_site_packages -) -ptscripts.virtualenv.VirtualEnv._remove_extra_site_packages = ( - _remove_extra_site_packages -) -ptscripts.virtualenv.VirtualEnv.run_code = run_code - REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent REQUIREMENTS_FILES_PATH = REPO_ROOT / "requirements" STATIC_REQUIREMENTS_PATH = REQUIREMENTS_FILES_PATH / "static" From 1f02f883f7efe1bf3930c14cc449ab71c98eaa89 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 14:47:45 -0700 Subject: [PATCH 42/58] Add arch to tools scripts cache seed for windows --- .github/workflows/build-deps-ci-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 767cbaf6f30d..a3546c099ab7 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -301,7 +301,7 @@ jobs: if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: ./.github/actions/setup-python-tools-scripts with: - cache-prefix: ${{ inputs.cache-prefix }}-build-deps-ci + cache-prefix: ${{ inputs.cache-prefix }}-build-deps-ci-${{ matrix.arch }} - name: Install System Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' From a86acc6a6666cfea56b793f876d3386100d0c86f Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 15:32:34 -0700 Subject: [PATCH 43/58] Install ppbt instead of toolchain fetch --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index fdd7e4147d1b..78b9871778c8 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1876,7 +1876,7 @@ def ci_test_onedir_pkgs(session): if IS_LINUX: # Fetch the toolchain - session_run_always(session, "python3", "-m", "relenv", "toolchain", "fetch") + session_run_always(session, "python3", "-m", "pip", "install", "ppbt") # Install requirements if _upgrade_pip_setuptools_and_wheel(session): From 8eccf55f683f15dea5169ffb2f3de117bfd64932 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 17:47:56 -0700 Subject: [PATCH 44/58] Bump relenv version to 0.20.1 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/nightly.yml | 6 +++--- .github/workflows/scheduled.yml | 4 ++-- .github/workflows/staging.yml | 6 +++--- cicd/shared-gh-workflows-context.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52d3db78b772..dc0dd9eb89a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -416,7 +416,7 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -432,7 +432,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5dca7dc3193c..a56d6053bf10 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -466,7 +466,7 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -482,7 +482,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" @@ -503,7 +503,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "src" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 2b8a425daa87..890abe5233c1 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -451,7 +451,7 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -467,7 +467,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 8e414f084896..182d573b36cc 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -447,7 +447,7 @@ jobs: with: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -464,7 +464,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "onedir" @@ -486,7 +486,7 @@ jobs: with: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} - relenv-version: "0.20.0" + relenv-version: "0.20.1" python-version: "3.10.18" ci-python-version: "3.11" source: "src" diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 3aa814feb061..8d4252c549a3 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,6 +1,6 @@ nox_version: "2022.8.7" python_version: "3.10.18" -relenv_version: "0.20.0" +relenv_version: "0.20.1" pr-testrun-slugs: - ubuntu-24.04-pkg - ubuntu-24.04 From d021d9f14ffe202aff2b90b99d91baf2b57587a2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Wed, 16 Jul 2025 19:13:43 -0700 Subject: [PATCH 45/58] No longer list d: on windows --- .github/workflows/test-packages-action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index 5865a66a3c48..ba88fc455a9a 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -382,7 +382,6 @@ jobs: - name: List Important Directories run: | - dir d:/ dir . dir artifacts/ dir artifacts/pkg From 0d98e544b0f2107a33271a2d7d48ed2e1058ecaa Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 17 Jul 2025 14:41:23 -0700 Subject: [PATCH 46/58] Build ci deps on windows 2025 --- .github/workflows/build-deps-ci-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index a3546c099ab7..d3e225ca6d0a 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -245,7 +245,7 @@ jobs: windows-dependencies: name: Windows - runs-on: windows-latest + runs-on: windows-2025 if: ${{ toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }} env: USE_S3_CACHE: 'false' From b101aed7ff076a3f8d927f77dde1c6fb7dde5a9d Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 17 Jul 2025 15:33:25 -0700 Subject: [PATCH 47/58] Build onedir on windows 2025 --- .github/workflows/build-salt-onedir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 149c791bb1ae..3549ab147b9d 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -167,7 +167,7 @@ jobs: max-parallel: 2 matrix: include: ${{ fromJSON(inputs.matrix)['windows'] }} - runs-on: windows-latest + runs-on: windows-2025 env: PIP_INDEX_URL: https://pypi.org/simple USE_S3_CACHE: 'false' From fe18c25af92c6c86dda7e2cf1dfab79a9fd63cf3 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 18 Jul 2025 17:04:03 -0700 Subject: [PATCH 48/58] Fix venv config --- noxfile.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index 78b9871778c8..7dac55313f97 100644 --- a/noxfile.py +++ b/noxfile.py @@ -1249,9 +1249,11 @@ def decompress_dependencies(session): if platform == "windows": extension = "tar.gz" scripts_dir_name = "Scripts" + pyexecutable = "python.exe" else: extension = "tar.xz" scripts_dir_name = "bin" + pyexecutable = "python" nox_dependencies_tarball = f"nox.{platform}.{arch}.{extension}" nox_dependencies_tarball_path = REPO_ROOT / nox_dependencies_tarball if not nox_dependencies_tarball_path.exists(): @@ -1264,9 +1266,30 @@ def decompress_dependencies(session): if os.environ.get("DELETE_NOX_ARCHIVE", "0") == "1": nox_dependencies_tarball_path.unlink() - session.log("Finding broken 'python' symlinks under '.nox/' ...") + session.log("Finding broken 'python' symlinks and configs under '.nox/' ...") for dirname in os.scandir(REPO_ROOT / ".nox"): scan_path = REPO_ROOT.joinpath(".nox", dirname, scripts_dir_name) + config = pathlib.Path(dirname) / "pyvenv.cfg" + values = {} + if config.exists(): + session.log(f"Found venv config: {config}") + with open(config, encoding="utf-8") as fp: + for line in fp: + key, val = (_.strip() for _ in line.split("=", 1)) + values[key] = val + values["home"] = str( + REPO_ROOT.joinpath("artifacts", "salt", scripts_dir_name) + ) + values["base-prefix"] = str(REPO_ROOT.joinpath("artifacts", "salt")) + values["base-exec-prefix"] = str(REPO_ROOT.joinpath("artifacts", "salt")) + values["base-executable"] = str( + REPO_ROOT.joinpath("artifacts", "salt", scripts_dir_name, pyexecutable) + ) + with open(config, "w", encoding="utf-8") as fp: + for key in values: + fp.write(f"{key} = {values[key]}\n") + else: + session.log(f"{config} does not exist") script_paths = {str(p): p for p in os.scandir(scan_path)} fixed_shebang = f"#!{scan_path / 'python'}" for key in sorted(script_paths): From a62e5f1ee5ff4bd5eb7b3793a76cb86a58ca94fd Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 18 Jul 2025 23:18:33 -0700 Subject: [PATCH 49/58] Photon OS enforces signature checking by defualt --- tests/support/pkg.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 8b0d94806531..122076e7cbae 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -520,6 +520,9 @@ def _install_pkgs(self, upgrade=False, downgrade=False): # tdnf does not detect nightly build versions to be higher version # than release versions upgrade_cmd = "install" + if "+" in self.pkgs[0]: + # self.pkgs are not signed unless this is a release. + args.append("--nogpgcheck") ret = self.proc.run( self.pkg_mngr, upgrade_cmd, @@ -528,6 +531,7 @@ def _install_pkgs(self, upgrade=False, downgrade=False): env=env, ) else: + args = ["install", "-y"] if self.distro_id == "photon": ret = self.proc.run( "rpm", @@ -535,8 +539,12 @@ def _install_pkgs(self, upgrade=False, downgrade=False): "https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public", ) self._check_retcode(ret) + if "+" in self.pkgs[0]: + # self.pkgs are not signed unless this is a release. + args.append("--nogpgcheck") log.info("Installing packages:\n%s", pprint.pformat(self.pkgs)) - ret = self.proc.run(self.pkg_mngr, "install", "-y", *self.pkgs) + args += self.pkgs + ret = self.proc.run(self.pkg_mngr, *args) if not platform.is_darwin() and not platform.is_windows(): # Make sure we don't have any trailing references to old package file locations From 551d83b3d5cf4a3ee0ebebbc42dd0a4a6661add8 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 18 Jul 2025 23:29:08 -0700 Subject: [PATCH 50/58] Revert "Build onedir on windows 2025" This reverts commit 88535cad40e210fedbe3286971f9b118e0be5368. --- .github/workflows/build-salt-onedir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml index 3549ab147b9d..149c791bb1ae 100644 --- a/.github/workflows/build-salt-onedir.yml +++ b/.github/workflows/build-salt-onedir.yml @@ -167,7 +167,7 @@ jobs: max-parallel: 2 matrix: include: ${{ fromJSON(inputs.matrix)['windows'] }} - runs-on: windows-2025 + runs-on: windows-latest env: PIP_INDEX_URL: https://pypi.org/simple USE_S3_CACHE: 'false' From f1a7488d32041e863570834fb4d55e2df0f8d1e5 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Fri, 18 Jul 2025 23:29:17 -0700 Subject: [PATCH 51/58] Revert "Build ci deps on windows 2025" This reverts commit cdd9be5dd76c767297bbf7d65a2ae7bd784f5d22. --- .github/workflows/build-deps-ci-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index d3e225ca6d0a..a3546c099ab7 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -245,7 +245,7 @@ jobs: windows-dependencies: name: Windows - runs-on: windows-2025 + runs-on: windows-latest if: ${{ toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }} env: USE_S3_CACHE: 'false' From 6699482e97ae1cf8dfcab4b98a4bacd4b1b481eb Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 19 Jul 2025 00:00:15 -0700 Subject: [PATCH 52/58] Bump cache seed --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/scheduled.yml | 2 +- .github/workflows/staging.yml | 2 +- .github/workflows/templates/layout.yml.jinja | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc0dd9eb89a5..c462fd0c722c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-0 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index a56d6053bf10..e28596139d5f 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-0 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 890abe5233c1..5d42e55cd00a 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -12,7 +12,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-0 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 182d573b36cc..77872e9f5a73 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -41,7 +41,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-0 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja index 26d855badf1d..bf57aa5623c8 100644 --- a/.github/workflows/templates/layout.yml.jinja +++ b/.github/workflows/templates/layout.yml.jinja @@ -38,7 +38,7 @@ on: env: COLUMNS: 190 - CACHE_SEED: SEED-5 # Bump the number to invalidate all caches + CACHE_SEED: SEED-0 # Bump the number to invalidate all caches RELENV_DATA: "${{ github.workspace }}/.relenv" PIP_DISABLE_PIP_VERSION_CHECK: "1" RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1" From 86b4edc07a706d0d5eaa2b1c5c3575da29e74396 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 19 Jul 2025 01:17:04 -0700 Subject: [PATCH 53/58] Windows 2025 test fix --- .github/workflows/test-action.yml | 7 +++++++ tests/support/helpers.py | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml index 6afa916e7e25..64820b8a8562 100644 --- a/.github/workflows/test-action.yml +++ b/.github/workflows/test-action.yml @@ -1060,6 +1060,13 @@ jobs: run: | nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} + - name: Show System Info + env: + SKIP_REQUIREMENTS_INSTALL: "1" + PRINT_SYSTEM_INFO_ONLY: "1" + run: | + nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} + - name: Run Changed Tests id: run-fast-changed-tests if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }} diff --git a/tests/support/helpers.py b/tests/support/helpers.py index 9d1597e37a38..95a6edd5e1ea 100644 --- a/tests/support/helpers.py +++ b/tests/support/helpers.py @@ -1748,11 +1748,13 @@ def get_installed_packages(self): return data def _create_virtualenv(self): - virtualenv = shutil.which("virtualenv") - if not virtualenv: - pytest.fail("'virtualenv' binary not found") + pyexec = shutil.which("python") + if not pyexec: + pytest.fail("'python' binary not found for virtualenv") cmd = [ - virtualenv, + pyexec, + "-m", + "virtualenv", f"--python={self.get_real_python()}", ] if self.system_site_packages: From 420521344dcdfe2297a00a8d2aee11a4e63bd984 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 19 Jul 2025 15:49:43 -0700 Subject: [PATCH 54/58] The d drive does not exist on windows 2025 --- .github/workflows/test-packages-action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index af171efdb3e2..1d01c590ec93 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -382,7 +382,6 @@ jobs: - name: List Important Directories run: | - dir d:/ dir . dir artifacts/ dir artifacts/pkg From 68aa01413787528b8425166919305d8e86e9a688 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 19 Jul 2025 16:43:28 -0700 Subject: [PATCH 55/58] Fix merge wart --- .github/workflows/build-deps-ci-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml index 767cbaf6f30d..a3546c099ab7 100644 --- a/.github/workflows/build-deps-ci-action.yml +++ b/.github/workflows/build-deps-ci-action.yml @@ -301,7 +301,7 @@ jobs: if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' uses: ./.github/actions/setup-python-tools-scripts with: - cache-prefix: ${{ inputs.cache-prefix }}-build-deps-ci + cache-prefix: ${{ inputs.cache-prefix }}-build-deps-ci-${{ matrix.arch }} - name: Install System Dependencies if: steps.nox-dependencies-cache.outputs.cache-hit != 'true' From 2c4c50494d759365bea719ec201b6bf213f53cad Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 20 Jul 2025 00:55:24 -0700 Subject: [PATCH 56/58] Allow for older immutables version on linux --- requirements/base.txt | 3 ++- requirements/static/ci/py3.10/darwin.txt | 2 +- requirements/static/ci/py3.10/freebsd.txt | 2 +- requirements/static/ci/py3.10/linux.txt | 2 +- requirements/static/ci/py3.10/windows.txt | 2 +- requirements/static/ci/py3.11/darwin.txt | 2 +- requirements/static/ci/py3.11/freebsd.txt | 2 +- requirements/static/ci/py3.11/linux.txt | 2 +- requirements/static/ci/py3.11/windows.txt | 2 +- requirements/static/ci/py3.12/cloud.txt | 2 +- requirements/static/ci/py3.12/darwin.txt | 2 +- requirements/static/ci/py3.12/docs.txt | 2 +- requirements/static/ci/py3.12/freebsd.txt | 2 +- requirements/static/ci/py3.12/lint.txt | 2 +- requirements/static/ci/py3.12/linux.txt | 2 +- requirements/static/ci/py3.12/windows.txt | 2 +- requirements/static/ci/py3.9/darwin.txt | 2 +- requirements/static/ci/py3.9/freebsd.txt | 2 +- requirements/static/ci/py3.9/linux.txt | 2 +- requirements/static/ci/py3.9/windows.txt | 2 +- requirements/static/pkg/py3.10/darwin.txt | 2 +- requirements/static/pkg/py3.10/freebsd.txt | 2 +- requirements/static/pkg/py3.10/linux.txt | 2 +- requirements/static/pkg/py3.10/windows.txt | 2 +- requirements/static/pkg/py3.11/darwin.txt | 2 +- requirements/static/pkg/py3.11/freebsd.txt | 2 +- requirements/static/pkg/py3.11/linux.txt | 2 +- requirements/static/pkg/py3.11/windows.txt | 2 +- requirements/static/pkg/py3.12/darwin.txt | 2 +- requirements/static/pkg/py3.12/freebsd.txt | 2 +- requirements/static/pkg/py3.12/linux.txt | 2 +- requirements/static/pkg/py3.12/windows.txt | 2 +- requirements/static/pkg/py3.9/darwin.txt | 2 +- requirements/static/pkg/py3.9/freebsd.txt | 2 +- requirements/static/pkg/py3.9/linux.txt | 2 +- requirements/static/pkg/py3.9/windows.txt | 2 +- 36 files changed, 37 insertions(+), 36 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 5c0ddc8b0be8..61d176986a4b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -48,7 +48,8 @@ croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' contextvars # immutables is a requirement of contextvars -immutables>=0.21 +immutables==0.15 ; sys_platform == 'linux' +immutables>=0.21 ; sys_platform != 'linux' cryptography>=42.0.0 urllib3>=1.26.20,<2.0.0; python_version < '3.10' diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index a630ea26eb32..4500c76f4d28 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -156,7 +156,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.10/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 2fe1ff6b0a84..07ff4cccdfc2 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -155,7 +155,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.10/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index f5aac54d1ee2..37997f0b85b5 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -179,7 +179,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.10/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index f10d5c638023..51f068f48888 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -156,7 +156,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.10/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index ae9ceec4dd0f..e1a7c9d2c31d 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -149,7 +149,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.11/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index fca2c7583ea0..905ac6f38914 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -148,7 +148,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.11/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index 441fd201e2bf..37de145a6137 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -170,7 +170,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.11/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 46f90596cafa..69c689393b0d 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -149,7 +149,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.11/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index a3fd3da659ba..0d17d6c32a6c 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -208,7 +208,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index e618ab6efbe7..427291655919 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -149,7 +149,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.12/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index 9a5a2acc6a71..9bab888c8a7d 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -77,7 +77,7 @@ idna==3.7 # yarl imagesize==1.4.1 # via sphinx -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/py3.12/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 4fa8ef69e4f0..ac697dd8a47f 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -148,7 +148,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.12/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index e342e46da274..adf642b16f6f 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -237,7 +237,7 @@ idna==3.7 # httpx # requests # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -c requirements/static/ci/py3.12/linux.txt diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 9c0578b71536..b83ef44c4271 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -170,7 +170,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.12/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index 30f0ee9c5df9..5cd04f7b4492 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -149,7 +149,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.12/windows.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 29e9fbb2667a..a6e94242ec85 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -159,7 +159,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.9/darwin.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index f10f6810a780..d49b163e24d9 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -158,7 +158,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.9/freebsd.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index aeea18218aff..842694aa3798 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -177,7 +177,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -c requirements/static/ci/../pkg/py3.9/linux.txt # -r requirements/base.txt diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 881f5638f2a6..e828cd427330 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -156,7 +156,7 @@ idna==3.7 # requests # trustme # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -c requirements/static/ci/../pkg/py3.9/windows.txt # -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 18f7b9192f2b..9e5a1e4b2ef7 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index 3b541adcef2f..f03c2e55f4e4 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index ff2c23adfabe..631981ea0ab4 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index 01cd459bedff..eee879ece7fc 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -50,7 +50,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 3872b4685df8..d2aebcbb8d4f 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index 00338ed19461..0bcd2ad008e9 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index b125879d9116..ac1726db86cd 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index 5f7d7450e17d..b46d9ec81304 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -48,7 +48,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index f3f02213679a..0c8770476d2e 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index 8875e8b878bb..88bf84aadaa1 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index 5e45f15bc771..49c082c7bf5f 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -42,7 +42,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index c63fd7bb4b22..0401ee7b55fe 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -48,7 +48,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 8764c699cbe4..5ee6367c3308 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index b3f64719c67d..cae9c24a585e 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index e6bcc029cbf1..1f7edb601315 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -44,7 +44,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.15 ; sys_platform == "linux" # via # -r requirements/base.txt # contextvars diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index ebde4fd18218..3d1c74ee515d 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -50,7 +50,7 @@ idna==3.7 # via # requests # yarl -immutables==0.21 +immutables==0.21 ; sys_platform != "linux" # via # -r requirements/base.txt # contextvars From 0c85d9a6ddd226dd989f5e364919b8ccf22409d2 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 21 Jul 2025 01:29:12 -0700 Subject: [PATCH 57/58] Bump python 3.11 to 3.11.13 --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/nightly.yml | 14 +++++++------- .github/workflows/scheduled.yml | 12 ++++++------ .github/workflows/staging.yml | 14 +++++++------- cicd/shared-gh-workflows-context.yml | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fb437e8cb9f..a34fe6d723da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -438,7 +438,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" 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'] }} @@ -454,7 +454,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -469,10 +469,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 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'] }} @@ -489,7 +489,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 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']) }} @@ -507,7 +507,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }} workflow-slug: ci default-timeout: 180 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7fa928338563..bbded212a68e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -433,7 +433,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" 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'] }} @@ -449,7 +449,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -470,7 +470,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -489,10 +489,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 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'] }} @@ -509,7 +509,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -527,7 +527,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true workflow-slug: nightly default-timeout: 360 diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e4a3f89d5b04..38018386c228 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -481,7 +481,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" 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'] }} @@ -497,7 +497,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -512,10 +512,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 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'] }} @@ -532,7 +532,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -550,7 +550,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true workflow-slug: scheduled default-timeout: 360 diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 8e6b8d45334a..b3fdeaac0898 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -469,7 +469,7 @@ jobs: cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }} salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" 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'] }} @@ -486,7 +486,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "onedir" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -508,7 +508,7 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }} relenv-version: "0.20.1" - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" source: "src" matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }} @@ -527,10 +527,10 @@ jobs: with: nox-session: ci-test-onedir nox-version: 2022.8.7 - python-version: "3.11.11" + python-version: "3.11.13" ci-python-version: "3.11" salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" - cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 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'] }} @@ -547,7 +547,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }} @@ -565,7 +565,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.11 + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.13 skip-code-coverage: true workflow-slug: staging default-timeout: 180 diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index ff96d17b3aff..ef008e05d983 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,5 +1,5 @@ nox_version: "2022.8.7" -python_version: "3.11.11" +python_version: "3.11.13" relenv_version: "0.20.1" release_branches: - "3006.x" From c68da53f72e388c0bf6efa1b302616c939f2e2c4 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Mon, 21 Jul 2025 02:08:44 -0700 Subject: [PATCH 58/58] The d drive is gone on windows-2025 runners --- .github/workflows/test-packages-action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test-packages-action.yml b/.github/workflows/test-packages-action.yml index af171efdb3e2..1d01c590ec93 100644 --- a/.github/workflows/test-packages-action.yml +++ b/.github/workflows/test-packages-action.yml @@ -382,7 +382,6 @@ jobs: - name: List Important Directories run: | - dir d:/ dir . dir artifacts/ dir artifacts/pkg pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy