saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge 3007.x into master

Browse source
This commit is contained in:
Pedro Algarvio 2024-05-10 19:30:57 +01:00
commit 71b1b655c6
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
56 changed files with 311 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build-deps-onedir.yml vendored
View file

@ -50,6 +50,7 @@ jobs:
runs-on:
- self-hosted
- linux
- medium
- ${{ matrix.arch }}
env:
USE_S3_CACHE: 'true'

15
.github/workflows/build-packages.yml vendored
View file

@ -165,6 +165,7 @@ jobs:
runs-on:
- self-hosted
- linux
- medium
- ${{ matrix.arch }}
strategy:
fail-fast: false
@ -182,6 +183,19 @@ jobs:
# Checkout here so we can easily use custom actions
- uses: actions/checkout@v4
# We need a more recent rustc
- name: Install a more recent `rustc`
if: ${{ inputs.source == 'src' }}
uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Set rust environment variables
if: ${{ inputs.source == 'src' }}
run: |
CARGO_HOME=${CARGO_HOME:-${HOME}/.cargo}
export CARGO_HOME
echo "CARGO_HOME=${CARGO_HOME}" | tee -a "${GITHUB_ENV}"
echo "${CARGO_HOME}/bin" | tee -a "${GITHUB_PATH}"
# Checkout here for the build process
- name: Checkout in build directory
uses: actions/checkout@v4
@ -263,6 +277,7 @@ jobs:
runs-on:
- self-hosted
- linux
- medium
- ${{ matrix.arch }}
strategy:
fail-fast: false

1
changelog/66433.security.md Normal file
View file

@ -0,0 +1 @@
Bump to `pydantic==2.6.4` due to https://github.com/advisories/GHSA-mr82-8j83-vxmv

1
pkg/debian/rules
View file

@ -17,6 +17,7 @@ override_dh_auto_clean:
ifeq ("${SALT_ONEDIR_ARCHIVE}", "")
override_dh_auto_build:
export PIP_CONSTRAINT=requirements/constraints.txt
export FETCH_RELENV_VERSION=$${SALT_RELENV_VERSION}
mkdir -p build/onedir
python3 -m venv --clear --copies build/onedir/venv

11
requirements/static/ci/py3.10/darwin.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
@ -326,7 +330,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# inflect
@ -523,6 +531,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

11
requirements/static/ci/py3.10/docs.txt
View file

@ -6,6 +6,10 @@
#
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# pydantic
autocommand==2.2.2
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -95,7 +99,11 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# inflect
@ -151,6 +159,7 @@ typing-extensions==4.8.0
# -c requirements/static/ci/py3.10/linux.txt
# inflect
# pydantic
# pydantic-core
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.18

11
requirements/static/ci/py3.10/freebsd.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
@ -330,7 +334,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# inflect
@ -528,6 +536,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

11
requirements/static/ci/py3.10/linux.txt
View file

@ -17,6 +17,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# pydantic
ansible-core==2.16.3
# via ansible
ansible==9.1.0 ; python_version >= "3.10"
@ -356,7 +360,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# inflect
@ -592,6 +600,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

4
requirements/static/ci/py3.10/tools.txt
View file

@ -36,9 +36,9 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.1
pydantic==2.6.4
# via python-tools-scripts
pygments==2.17.2
# via rich

11
requirements/static/ci/py3.10/windows.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# pydantic
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
@ -290,7 +294,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# inflect
@ -478,6 +486,7 @@ typing-extensions==4.8.0
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# inflect
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

4
requirements/static/ci/py3.11/darwin.txt
View file

@ -323,11 +323,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# inflect

4
requirements/static/ci/py3.11/docs.txt
View file

@ -99,11 +99,11 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# cherrypy
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.11/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.11/linux.txt
# inflect

4
requirements/static/ci/py3.11/freebsd.txt
View file

@ -327,11 +327,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# inflect

4
requirements/static/ci/py3.11/linux.txt
View file

@ -351,11 +351,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# inflect

4
requirements/static/ci/py3.11/tools.txt
View file

@ -36,9 +36,9 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.1
pydantic==2.6.4
# via python-tools-scripts
pygments==2.17.2
# via rich

4
requirements/static/ci/py3.11/windows.txt
View file

@ -287,11 +287,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# inflect

4
requirements/static/ci/py3.12/cloud.txt
View file

@ -454,12 +454,12 @@ pycryptodomex==3.19.1
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt

4
requirements/static/ci/py3.12/darwin.txt
View file

@ -323,11 +323,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# inflect

4
requirements/static/ci/py3.12/docs.txt
View file

@ -175,11 +175,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.12/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# inflect

4
requirements/static/ci/py3.12/freebsd.txt
View file

@ -327,11 +327,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# inflect

4
requirements/static/ci/py3.12/lint.txt
View file

@ -477,12 +477,12 @@ pycryptodomex==3.19.1
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt

4
requirements/static/ci/py3.12/linux.txt
View file

@ -351,11 +351,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# inflect

4
requirements/static/ci/py3.12/tools.txt
View file

@ -36,9 +36,9 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.1
pydantic==2.6.4
# via python-tools-scripts
pygments==2.17.2
# via rich

4
requirements/static/ci/py3.12/windows.txt
View file

@ -287,11 +287,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# pydantic
pydantic==2.5.2
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# inflect

12
requirements/static/ci/py3.8/docs.txt
View file

@ -6,6 +6,10 @@
#
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# pydantic
autocommand==2.2.2
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -103,7 +107,11 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# cherrypy
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.8/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.8/linux.txt
# inflect
@ -158,8 +166,10 @@ tempora==5.3.0
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# annotated-types
# inflect
# pydantic
# pydantic-core
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.18

12
requirements/static/ci/py3.8/freebsd.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
@ -334,7 +338,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# inflect
@ -529,9 +537,11 @@ types-pyyaml==6.0.1
typing-extensions==4.8.0
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# annotated-types
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

12
requirements/static/ci/py3.8/linux.txt
View file

@ -17,6 +17,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# pydantic
anyio==4.1.0
# via httpcore
apache-libcloud==3.7.0 ; sys_platform != "win32"
@ -353,7 +357,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# inflect
@ -581,9 +589,11 @@ twilio==8.2.2
typing-extensions==4.8.0
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# annotated-types
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

12
requirements/static/ci/py3.8/windows.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# pydantic
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
@ -294,7 +298,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# inflect
@ -481,8 +489,10 @@ types-pyyaml==6.0.1
typing-extensions==4.8.0
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# annotated-types
# inflect
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

11
requirements/static/ci/py3.9/darwin.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
@ -326,7 +330,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# inflect
@ -523,6 +531,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

11
requirements/static/ci/py3.9/docs.txt
View file

@ -6,6 +6,10 @@
#
alabaster==0.7.13
# via sphinx
annotated-types==0.6.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# pydantic
autocommand==2.2.2
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -99,7 +103,11 @@ portend==3.1.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# cherrypy
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/py3.9/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/py3.9/linux.txt
# inflect
@ -155,6 +163,7 @@ typing-extensions==4.8.0
# -c requirements/static/ci/py3.9/linux.txt
# inflect
# pydantic
# pydantic-core
uc-micro-py==1.0.2
# via linkify-it-py
urllib3==1.26.18

11
requirements/static/ci/py3.9/freebsd.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# pydantic
apache-libcloud==3.7.0 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
asn1crypto==1.5.1
@ -330,7 +334,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# inflect
@ -528,6 +536,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

11
requirements/static/ci/py3.9/linux.txt
View file

@ -17,6 +17,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# pydantic
anyio==4.1.0
# via httpcore
apache-libcloud==3.7.0 ; sys_platform != "win32"
@ -349,7 +353,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# inflect
@ -580,6 +588,7 @@ typing-extensions==4.8.0
# inflect
# napalm
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

4
requirements/static/ci/py3.9/tools.txt
View file

@ -36,9 +36,9 @@ mdurl==0.1.2
# via markdown-it-py
packaging==23.1
# via -r requirements/static/ci/tools.in
pydantic-core==2.16.2
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.1
pydantic==2.6.4
# via python-tools-scripts
pygments==2.17.2
# via rich

11
requirements/static/ci/py3.9/windows.txt
View file

@ -13,6 +13,10 @@ aiosignal==1.3.1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# aiohttp
annotated-types==0.6.0
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# pydantic
async-timeout==4.0.3
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
@ -290,7 +294,11 @@ pycryptodomex==3.19.1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# pydantic
pydantic==2.6.4
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# inflect
@ -479,6 +487,7 @@ typing-extensions==4.8.0
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# inflect
# pydantic
# pydantic-core
# pytest-shell-utilities
# pytest-system-statistics
urllib3==1.26.18

7
requirements/static/pkg/py3.10/darwin.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -119,6 +123,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.10/freebsd.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -119,6 +123,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.10/linux.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -121,6 +125,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.10/windows.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -99,7 +101,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pymssql==2.2.7 ; sys_platform == "win32"
# via -r requirements/base.txt
@ -141,6 +145,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"

4
requirements/static/pkg/py3.11/darwin.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.11/freebsd.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.11/linux.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.11/windows.txt
View file

@ -99,9 +99,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pymssql==2.2.7 ; sys_platform == "win32"
# via -r requirements/base.txt

4
requirements/static/pkg/py3.12/darwin.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.12/freebsd.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.12/linux.txt
View file

@ -89,9 +89,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt

4
requirements/static/pkg/py3.12/windows.txt
View file

@ -99,9 +99,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic-core==2.14.5
pydantic-core==2.16.3
# via pydantic
pydantic==2.5.2
pydantic==2.6.4
# via inflect
pymssql==2.2.7 ; sys_platform == "win32"
# via -r requirements/base.txt

8
requirements/static/pkg/py3.8/freebsd.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -91,7 +93,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -119,8 +123,10 @@ tornado==6.3.3
# via -r requirements/base.txt
typing-extensions==4.8.0
# via
# annotated-types
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

8
requirements/static/pkg/py3.8/linux.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -91,7 +93,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -121,8 +125,10 @@ tornado==6.3.3
# via -r requirements/base.txt
typing-extensions==4.8.0
# via
# annotated-types
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

8
requirements/static/pkg/py3.8/windows.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -101,7 +103,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pymssql==2.2.7 ; sys_platform == "win32"
# via -r requirements/base.txt
@ -142,8 +146,10 @@ tornado==6.3.3
# via -r requirements/base.txt
typing-extensions==4.8.0
# via
# annotated-types
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"

7
requirements/static/pkg/py3.9/darwin.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -119,6 +123,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.9/freebsd.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -119,6 +123,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.9/linux.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -89,7 +91,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pyopenssl==24.0.0
# via -r requirements/base.txt
@ -121,6 +125,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
yarl==1.9.4

7
requirements/static/pkg/py3.9/windows.txt
View file

@ -8,6 +8,8 @@ aiohttp==3.9.5
# via -r requirements/base.txt
aiosignal==1.3.1
# via aiohttp
annotated-types==0.6.0
# via pydantic
async-timeout==4.0.3
# via aiohttp
attrs==23.2.0
@ -99,7 +101,9 @@ pycparser==2.21
# via cffi
pycryptodomex==3.19.1
# via -r requirements/crypto.txt
pydantic==1.10.8
pydantic-core==2.16.3
# via pydantic
pydantic==2.6.4
# via inflect
pymssql==2.2.7 ; sys_platform == "win32"
# via -r requirements/base.txt
@ -142,6 +146,7 @@ typing-extensions==4.8.0
# via
# inflect
# pydantic
# pydantic-core
urllib3==1.26.18
# via requests
wmi==1.5.1 ; sys_platform == "win32"

15
tools/pkg/build.py
View file

@ -8,6 +8,7 @@ from __future__ import annotations
import json
import logging
import os
import os.path
import pathlib
import shutil
import tarfile
@ -90,6 +91,20 @@ def debian(
os.environ[key] = value
env_args.extend(["-e", key])
cargo_home = os.environ.get("CARGO_HOME")
user_cargo_bin = os.path.expanduser("~/.cargo/bin")
if os.path.exists(user_cargo_bin):
ctx.info(
f"The path '{user_cargo_bin}' exists so adding --prepend-path={user_cargo_bin}"
)
env_args.append(f"--prepend-path={user_cargo_bin}")
elif cargo_home is not None:
cargo_home_bin = os.path.join(cargo_home, "bin")
ctx.info(
f"The 'CARGO_HOME' environment variable is set, so adding --prepend-path={cargo_home_bin}"
)
env_args.append(f"--prepend-path={cargo_home_bin}")
env = os.environ.copy()
env["PIP_CONSTRAINT"] = str(
tools.utils.REPO_ROOT / "requirements" / "constraints.txt"

4
tools/testsuite/__init__.py
View file

@ -46,7 +46,7 @@ ts = command_group(name="ts", help="Test Suite Related Commands", description=__
},
"arch": {
"help": "The onedir artifact architecture",
"choices": ("x86_64", "aarch64", "amd64", "x86"),
"choices": ("x86_64", "arm64", "amd64", "x86"),
},
"slug": {
"help": "The OS slug",
@ -106,7 +106,7 @@ def setup_testsuite(
ctx.exit(1)
if "arm64" in slug:
arch = "aarch64"
arch = "arm64"
ctx.warn(
"Consider this in preliminary support. There are most likely things to iron out still."

30
tools/utils/gh.py
View file

@ -40,15 +40,15 @@ def download_onedir_artifact(
)
return ExitCode.FAIL
else:
if arch == "arm64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'")
arch = "aarch64"
if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "arm64"
elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64"
if arch not in ("x86_64", "aarch64"):
if arch not in ("x86_64", "arm64"):
ctx.error(
f"The allowed values for '--arch' on {platform.title()} are 'x86_64', 'aarch64' or 'arm64'"
f"The allowed values for '--arch' on {platform.title()} are 'x86_64' or 'arm64'"
)
return ExitCode.FAIL
artifacts_path = tools.utils.REPO_ROOT / "artifacts"
@ -129,15 +129,15 @@ def download_nox_artifact(
)
return ExitCode.FAIL
else:
if arch == "arm64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'")
arch = "aarch64"
if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "arm64"
elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64"
if arch not in ("x86_64", "aarch64"):
if arch not in ("x86_64", "arm64"):
ctx.error(
f"The allowed values for '--arch' on {platform.title()} are 'x86_64', 'aarch64' or 'arm64'"
f"The allowed values for '--arch' on {platform.title()} are 'x86_64' or 'arm64'"
)
return ExitCode.FAIL
@ -204,15 +204,15 @@ def download_pkgs_artifact(
return ExitCode.FAIL
artifact_name += f"{arch}-MSI"
else:
if arch == "arm64":
ctx.info(f"Turning passed arch {arch!r} into 'aarch64'")
arch = "aarch64"
if arch == "aarch64":
ctx.info(f"Turning passed arch {arch!r} into 'arm64'")
arch = "arm64"
elif arch == "x64":
ctx.info(f"Turning passed arch {arch!r} into 'x86_64'")
arch = "x86_64"
if arch not in ("x86_64", "aarch64"):
if arch not in ("x86_64", "arm64"):
ctx.error(
f"The allowed values for '--arch' for {slug} are 'x86_64', 'aarch64' or 'arm64'"
f"The allowed values for '--arch' for {slug} are 'x86_64' or 'arm64'"
)
return ExitCode.FAIL