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

Merge branch '3007.x' into merge/master/3007.x

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-07-04 21:35:33 -07:00
commit 539664c6ba
205 changed files with 4606 additions and 1723 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
.github/CODEOWNERS vendored
View file

@ -9,55 +9,4 @@
# This file uses an fnmatch-style matching pattern.
# Team Core
* @saltstack/team-core
# Team Boto
salt/*/*boto* @saltstack/team-core
# Team Cloud
salt/cloud/* @saltstack/team-core
salt/utils/openstack/* @saltstack/team-core
salt/utils/aws.py @saltstack/team-core
salt/*/*cloud* @saltstack/team-core
# Team NetAPI
salt/cli/api.py @saltstack/team-core
salt/client/netapi.py @saltstack/team-core
salt/netapi/* @saltstack/team-core
# Team Network
salt/proxy/* @saltstack/team-core
# Team SPM
salt/cli/spm.py @saltstack/team-core
salt/spm/* @saltstack/team-core
# Team SSH
salt/cli/ssh.py @saltstack/team-core
salt/client/ssh/* @saltstack/team-core
salt/roster/* @saltstack/team-core
salt/runners/ssh.py @saltstack/team-core
salt/*/thin.py @saltstack/team-core
# Team State
salt/state.py @saltstack/team-core
# Team SUSE
salt/*/*btrfs* @saltstack/team-core
salt/*/*kubernetes* @saltstack/team-core
salt/*/*pkg* @saltstack/team-core
salt/*/*snapper* @saltstack/team-core
salt/*/*xfs* @saltstack/team-core
salt/*/*zypper* @saltstack/team-core
# Team Transport
salt/transport/* @saltstack/team-core
salt/utils/zeromq.py @saltstack/team-core
# Team Windows
salt/*/*win* @saltstack/team-core
salt/modules/reg.py @saltstack/team-core
salt/states/reg.py @saltstack/team-core
tests/*/*win* @saltstack/team-core
tests/*/test_reg.py @saltstack/team-core
tests/pytests/* @saltstack/team-core @s0undt3ch
* @saltstack/salt-core-maintainers

15
.github/workflows/build-deps-ci-action.yml vendored
View file

@ -40,8 +40,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
@ -52,6 +53,8 @@ jobs:
runs-on: ubuntu-latest
outputs:
matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"
@ -66,6 +69,8 @@ jobs:
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
@ -123,7 +128,7 @@ jobs:
- name: PyPi Proxy
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
run: |
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
- name: Setup Python Tools Scripts
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
@ -195,6 +200,8 @@ jobs:
fail-fast: false
matrix:
include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }}
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"
@ -321,7 +328,7 @@ jobs:
- name: PyPi Proxy
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
run: |
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
- name: Setup Python Tools Scripts
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

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

@ -32,8 +32,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
jobs:
@ -98,6 +99,7 @@ jobs:
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
env:
USE_S3_CACHE: 'false'
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"
@ -148,6 +150,7 @@ jobs:
runs-on: windows-latest
env:
USE_S3_CACHE: 'false'
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"

3
.github/workflows/build-docs.yml vendored
View file

@ -17,8 +17,7 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
PIP_INDEX_URL: https://pypi.org/simple
PIP_DISABLE_PIP_VERSION_CHECK: "1"
jobs:

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

@ -39,8 +39,9 @@ on:
env:
COLUMNS: 190
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
jobs:
@ -54,7 +55,8 @@ jobs:
arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
source:
- ${{ inputs.source }}
env:
PIP_INDEX_URL: https://pypi.org/simple
runs-on:
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
@ -289,7 +291,7 @@ jobs:
- ${{ inputs.source }}
container:
image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
steps:
- uses: actions/checkout@v4
@ -375,6 +377,7 @@ jobs:
SM_CLIENT_CERT_PASSWORD: "${{ secrets.WIN_SIGN_CERT_PASSWORD }}"
SM_CLIENT_CERT_FILE_B64: "${{ secrets.WIN_SIGN_CERT_FILE_B64 }}"
WIN_SIGN_CERT_SHA1_HASH: "${{ secrets.WIN_SIGN_CERT_SHA1_HASH }}"
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: Check Package Signing Enabled

10
.github/workflows/build-salt-onedir.yml vendored
View file

@ -32,8 +32,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
jobs:
@ -102,6 +103,8 @@ jobs:
arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
runs-on:
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"
@ -156,6 +159,9 @@ jobs:
- x86
- amd64
runs-on: windows-latest
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: "Throttle Builds"

55
.github/workflows/ci.yml vendored
View file

@ -437,7 +437,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-salt-onedir:
@ -453,7 +453,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-pkgs-onedir:
@ -466,7 +466,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "onedir"
@ -480,7 +480,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "src"
build-ci-deps:
@ -666,27 +666,6 @@ jobs:
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centos-7-pkg-tests:
name: CentOS 7 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'centos-7') }}
needs:
- prepare-workflow
- build-pkgs-onedir
- build-ci-deps
uses: ./.github/workflows/test-packages-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-11-pkg-tests:
name: Debian 11 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
@ -1579,27 +1558,6 @@ jobs:
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centos-7:
name: CentOS 7 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'centos-7') }}
needs:
- prepare-workflow
- build-ci-deps
uses: ./.github/workflows/test-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
workflow-slug: ci
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-11:
name: Debian 11 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
@ -2028,6 +1986,8 @@ jobs:
name: Combine Code Coverage
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
runs-on: ubuntu-latest
env:
PIP_INDEX_URL: https://pypi.org/simple
needs:
- prepare-workflow
- build-ci-deps
@ -2046,7 +2006,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -2214,7 +2173,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -2243,7 +2201,6 @@ jobs:
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests

7
.github/workflows/lint-action.yml vendored
View file

@ -11,8 +11,7 @@ on:
env:
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
PIP_INDEX_URL: https://pypi.org/simple
PIP_DISABLE_PIP_VERSION_CHECK: "1"
@ -23,7 +22,7 @@ jobs:
if: ${{ 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.9
image: ghcr.io/saltstack/salt-ci-containers/python:3.10
steps:
- name: Install System Deps
@ -67,7 +66,7 @@ jobs:
if: ${{ 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.8
image: ghcr.io/saltstack/salt-ci-containers/python:3.10
steps:
- name: Install System Deps

67
.github/workflows/nightly.yml vendored
View file

@ -494,7 +494,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-salt-onedir:
@ -510,7 +510,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-pkgs-onedir:
@ -523,7 +523,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "onedir"
environment: nightly
@ -541,7 +541,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "src"
environment: nightly
@ -731,27 +731,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centos-7-pkg-tests:
name: CentOS 7 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-pkgs-onedir
- build-ci-deps
uses: ./.github/workflows/test-packages-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-11-pkg-tests:
name: Debian 11 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1644,27 +1623,6 @@ jobs:
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centos-7:
name: CentOS 7 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps
uses: ./.github/workflows/test-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: false
workflow-slug: nightly
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-11:
name: Debian 11 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -2093,6 +2051,8 @@ jobs:
name: Combine Code Coverage
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
runs-on: ubuntu-latest
env:
PIP_INDEX_URL: https://pypi.org/simple
needs:
- prepare-workflow
- build-ci-deps
@ -2111,7 +2071,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -2558,18 +2517,6 @@ jobs:
distro: photon
version: "5"
arch: aarch64
- pkg-type: rpm
distro: redhat
version: "7"
arch: x86_64
- pkg-type: rpm
distro: redhat
version: "7"
arch: arm64
- pkg-type: rpm
distro: redhat
version: "7"
arch: aarch64
- pkg-type: rpm
distro: redhat
version: "8"
@ -3031,7 +2978,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -3118,7 +3064,6 @@ jobs:
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests

5
.github/workflows/release-tag.yml vendored
View file

@ -19,8 +19,9 @@ on:
env:
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
permissions:

5
.github/workflows/release-upload-virustotal.yml vendored
View file

@ -20,8 +20,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
jobs:
upload-virustotal:

55
.github/workflows/scheduled.yml vendored
View file

@ -484,7 +484,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-salt-onedir:
@ -500,7 +500,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-pkgs-onedir:
@ -513,7 +513,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "onedir"
@ -527,7 +527,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "src"
build-ci-deps:
@ -713,27 +713,6 @@ jobs:
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centos-7-pkg-tests:
name: CentOS 7 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-pkgs-onedir
- build-ci-deps
uses: ./.github/workflows/test-packages-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: false
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-11-pkg-tests:
name: Debian 11 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1626,27 +1605,6 @@ jobs:
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centos-7:
name: CentOS 7 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps
uses: ./.github/workflows/test-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: false
workflow-slug: scheduled
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-11:
name: Debian 11 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -2075,6 +2033,8 @@ jobs:
name: Combine Code Coverage
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
runs-on: ubuntu-latest
env:
PIP_INDEX_URL: https://pypi.org/simple
needs:
- prepare-workflow
- build-ci-deps
@ -2093,7 +2053,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -2263,7 +2222,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -2292,7 +2250,6 @@ jobs:
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests

64
.github/workflows/staging.yml vendored
View file

@ -476,7 +476,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-salt-onedir:
@ -492,7 +492,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
build-pkgs-onedir:
@ -505,7 +505,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "onedir"
environment: staging
@ -523,7 +523,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.16.0"
relenv-version: "0.17.0"
python-version: "3.10.14"
source: "src"
environment: staging
@ -713,27 +713,6 @@ jobs:
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
centos-7-pkg-tests:
name: CentOS 7 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-pkgs-onedir
- build-ci-deps
uses: ./.github/workflows/test-packages-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
pkg-type: rpm
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
debian-11-pkg-tests:
name: Debian 11 Package Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -1626,27 +1605,6 @@ jobs:
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
centos-7:
name: CentOS 7 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
needs:
- prepare-workflow
- build-ci-deps
uses: ./.github/workflows/test-action-linux.yml
with:
distro-slug: centos-7
nox-session: ci-test-onedir
platform: linux
arch: x86_64
nox-version: 2022.8.7
gh-actions-python-version: "3.10"
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
skip-code-coverage: true
workflow-slug: staging
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
debian-11:
name: Debian 11 Test
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
@ -2381,18 +2339,6 @@ jobs:
distro: photon
version: "5"
arch: aarch64
- pkg-type: rpm
distro: redhat
version: "7"
arch: x86_64
- pkg-type: rpm
distro: redhat
version: "7"
arch: arm64
- pkg-type: rpm
distro: redhat
version: "7"
arch: aarch64
- pkg-type: rpm
distro: redhat
version: "8"
@ -2988,7 +2934,6 @@ jobs:
- amazonlinux-2023
- amazonlinux-2023-arm64
- archlinux-lts
- centos-7
- debian-11
- debian-11-arm64
- debian-12
@ -3017,7 +2962,6 @@ jobs:
- amazonlinux-2-arm64-pkg-tests
- amazonlinux-2023-pkg-tests
- amazonlinux-2023-arm64-pkg-tests
- centos-7-pkg-tests
- debian-11-pkg-tests
- debian-11-arm64-pkg-tests
- debian-12-pkg-tests

2
.github/workflows/templates/ci.yml.jinja vendored
View file

@ -311,6 +311,8 @@
name: Combine Code Coverage
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
runs-on: ubuntu-latest
env:
PIP_INDEX_URL: https://pypi.org/simple
needs:
- prepare-workflow
<%- for need in test_salt_needs.iter(consume=False) %>

11
.github/workflows/test-action-linux.yml vendored
View file

@ -70,8 +70,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
@ -97,6 +98,8 @@ jobs:
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
@ -159,7 +162,7 @@ jobs:
- name: PyPi Proxy
run: |
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
@ -307,6 +310,8 @@ jobs:
needs:
- test
- generate-matrix
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: Checkout Source Code

11
.github/workflows/test-action-macos.yml vendored
View file

@ -67,8 +67,9 @@ on:
env:
COLUMNS: 190
PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/"
PIP_EXTRA_INDEX_URL: "https://pypi.org/simple"
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"
@ -94,6 +95,8 @@ jobs:
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
@ -162,6 +165,8 @@ jobs:
- name: Install Nox
run: |
python3 -m pip install 'nox==${{ inputs.nox-version }}'
env:
PIP_INDEX_URL: https://pypi.org/simple
- name: Decompress .nox Directory
run: |
@ -335,6 +340,8 @@ jobs:
needs:
- test
- generate-matrix
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: Checkout Source Code

11
.github/workflows/test-action-windows.yml vendored
View file

@ -70,8 +70,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
@ -97,6 +98,8 @@ jobs:
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
@ -159,7 +162,7 @@ jobs:
- name: PyPi Proxy
run: |
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
@ -308,6 +311,8 @@ jobs:
needs:
- test
- generate-matrix
env:
PIP_INDEX_URL: https://pypi.org/simple
steps:
- name: Checkout Source Code

8
.github/workflows/test-package-downloads-action.yml vendored
View file

@ -48,8 +48,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
@ -74,6 +75,8 @@ jobs:
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
@ -296,6 +299,7 @@ jobs:
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:

5
.github/workflows/test-packages-action-linux.yml vendored
View file

@ -65,8 +65,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
USE_S3_CACHE: 'true'

9
.github/workflows/test-packages-action-macos.yml vendored
View file

@ -62,8 +62,9 @@ on:
env:
COLUMNS: 190
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"
@ -162,6 +163,8 @@ jobs:
- name: Install Nox
run: |
python3 -m pip install 'nox==${{ inputs.nox-version }}'
env:
PIP_INDEX_URL: https://pypi.org/simple
- name: Download nox.macos.${{ inputs.arch }}.tar.* artifact for session ${{ inputs.nox-session }}
uses: actions/download-artifact@v4
@ -263,3 +266,5 @@ jobs:
- name: Install Nox
run: |
python3 -m pip install 'nox==${{ inputs.nox-version }}'
env:
PIP_INDEX_URL: https://pypi.org/simple

5
.github/workflows/test-packages-action-windows.yml vendored
View file

@ -65,8 +65,9 @@ env:
COLUMNS: 190
AWS_MAX_ATTEMPTS: "10"
AWS_RETRY_MODE: "adaptive"
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
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"

114
SECURITY.md
View file

@ -4,77 +4,65 @@
- saltproject-security.pdl@broadcom.com
**GPG key ID:**
- 4EA0793D
- 37654A06
**GPG key fingerprint:**
- `8ABE 4EFC F0F4 B24B FF2A AF90 D570 F2D3 4EA0 793D`
- `99EF 26F2 6469 2D24 973A 7007 E8BF 76A7 3765 4A06`
**GPG Public Key**
```
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
vtBIWO4LPeGEvb2Gs65PL2eouOqU6yvBr5Y=
=F/97
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
=pPmt
-----END PGP PUBLIC KEY BLOCK-----
```

1
changelog/50196.fixed.md Normal file
View file

@ -0,0 +1 @@
Made slsutil.renderer work with salt-ssh

1
changelog/51605.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed defaults.merge is not available when using salt-ssh

1
changelog/56441.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed config.get does not support merge option with salt-ssh

1
changelog/57649.fixed.md Normal file
View file

@ -0,0 +1 @@
Update to include croniter in pkg requirements

1
changelog/61100.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed state.test does not work with salt-ssh

1
changelog/61143.fixed.md Normal file
View file

@ -0,0 +1 @@
Made slsutil.findup work with salt-ssh

1
changelog/64300.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix utf8 handling in 'pass' renderer

1
changelog/64728.fixed.md Normal file
View file

@ -0,0 +1 @@
salt-cloud honors root_dir config setting for log_file location and fixes for root_dir locations on windows.

1
changelog/65067.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed slsutil.update with salt-ssh during template rendering

1
changelog/65251.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix config.items when called on minion

1
changelog/65304.fixed.md Normal file
View file

@ -0,0 +1 @@
pkg.installed state aggregate does not honors requires requisite

1
changelog/65630.fixed.md Normal file
View file

@ -0,0 +1 @@
Added SSH wrapper for logmod

1
changelog/65816.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix for GitFS failure to unlock lock file, and resource cleanup for process SIGTERM

1
changelog/66330.fixed.md Normal file
View file

@ -0,0 +1 @@
fix #66194: Exchange HTTPClient by AsyncHTTPClient in salt.utils.http

1
changelog/66347.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix win_task ExecutionTimeLimit and result/error code interpretation

1
changelog/66414.fixed.md Normal file
View file

@ -0,0 +1 @@
Fixed x509_v2 certificate.managed crash for locally signed certificates if the signing policy defines signing_private_key

1
changelog/66441.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix win_task ExecutionTimeLimit and result/error code interpretation

1
changelog/66579.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix support for FIPS approved encryption and signing algorithms.

1
changelog/66604.fixed.md Normal file
View file

@ -0,0 +1 @@
Fix RPM package provides

1
changelog/66623.deprecated.md Normal file
View file

@ -0,0 +1 @@
Drop CentOS 7 support

1
changelog/66624.added.md Normal file
View file

@ -0,0 +1 @@
Build RPM packages with Rocky Linux 9 (instead of CentOS Stream 9)

1
changelog/66624.deprecated.md Normal file
View file

@ -0,0 +1 @@
No longer build RPM packages with CentOS Stream 9

1
changelog/66632.fixed.md Normal file
View file

@ -0,0 +1 @@
Upgrade relAenv to 0.16.1. This release fixes several package installs for salt-pip

1
changelog/66663.fixed.md Normal file
View file

@ -0,0 +1 @@
Upgrade relenv to 0.17.0 (https://github.com/saltstack/relenv/blob/v0.17.0/CHANGELOG.md)

4
changelog/66666.fixed.md Normal file
View file

@ -0,0 +1,4 @@
Upgrade dependencies due to security issues:
- pymysql>=1.1.1
- requests>=2.32.0
- docker>=7.1.0

1
changelog/66683.fixed.md Normal file
View file

@ -0,0 +1 @@
Corrected missed line in branch 3006.x when backporting from PR 61620 and 65044

20
cicd/golden-images.json
View file

@ -49,26 +49,6 @@
"is_windows": "false",
"ssh_username": "arch"
},
"centos-7-arm64": {
"ami": "ami-0ef52419c91cb0169",
"ami_description": "CI Image of CentOS 7 arm64",
"ami_name": "salt-project/ci/centos/7/arm64/20240509.1530",
"arch": "arm64",
"cloudwatch-agent-available": "true",
"instance_type": "m6g.large",
"is_windows": "false",
"ssh_username": "centos"
},
"centos-7": {
"ami": "ami-0973c8d1b91dcba5c",
"ami_description": "CI Image of CentOS 7 x86_64",
"ami_name": "salt-project/ci/centos/7/x86_64/20240509.1530",
"arch": "x86_64",
"cloudwatch-agent-available": "true",
"instance_type": "t3a.large",
"is_windows": "false",
"ssh_username": "centos"
},
"debian-11-arm64": {
"ami": "ami-0eff227d9a94d8692",
"ami_description": "CI Image of Debian 11 arm64",

2
cicd/shared-gh-workflows-context.yml
View file

@ -1,6 +1,6 @@
nox_version: "2022.8.7"
python_version: "3.10.14"
relenv_version: "0.16.0"
relenv_version: "0.17.0"
release_branches:
- "3006.x"
- "3007.x"

22
doc/ref/configuration/master.rst
View file

@ -96,6 +96,14 @@ The user to run the Salt processes
user: root
.. note::
Starting with version `3006.0`, Salt's offical packages ship with a default
configuration which runs the Master as a non-priviledged user. The Master's
configuration file has the `user` option set to `user: salt`. Unless you
are absolutly sure want to run salt as some other user, care should be
taken to preserve this setting in your Master configuration file..
.. conf_master:: ret_port
``enable_ssh_minions``
@ -2123,6 +2131,20 @@ The number of seconds between AES key rotations on the master.
.. conf_master:: ssl
``publish_signing_algorithm``
-----------------------------
.. versionadded:: 3006.9
Default: PKCS1v15-SHA1
The RSA signing algorithm used by this minion when connecting to the
master's request channel. Valid values are ``PKCS1v15-SHA1`` and
``PKCS1v15-SHA224``. Minions must be at version ``3006.9`` or greater if this
is changed from the default setting.
``ssl``
-------

22
doc/ref/configuration/minion.rst
View file

@ -3170,6 +3170,28 @@ constant names without ssl module prefix: ``CERT_REQUIRED`` or ``PROTOCOL_SSLv23
certfile: <path_to_certfile>
ssl_version: PROTOCOL_TLSv1_2
``encryption_algorithm``
------------------------
.. versionadded:: 3006.9
Default: OAEP-SHA1
The RSA encryption algorithm used by this minion when connecting to the
master's request channel. Valid values are ``OAEP-SHA1`` and ``OAEP-SHA224``
``signing_algorithm``
------------------------
.. versionadded:: 3006.9
Default: PKCS1v15-SHA1
The RSA signing algorithm used by this minion when connecting to the
master's request channel. Valid values are ``PKCS1v15-SHA1`` and
``PKCS1v15-SHA224``
Reactor Settings
================

151
doc/security/index.rst
View file

@ -5,8 +5,8 @@ Security disclosure policy
==========================
:email: saltproject-security.pdl@broadcom.com
:gpg key ID: 4EA0793D
:gpg key fingerprint: ``8ABE 4EFC F0F4 B24B FF2A AF90 D570 F2D3 4EA0 793D``
:gpg key ID: 37654A06
:gpg key fingerprint: ``99EF 26F2 6469 2D24 973A 7007 E8BF 76A7 3765 4A06``
**gpg public key:**
@ -14,104 +14,55 @@ Security disclosure policy
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
fwPKmQ2cKnCBs5ASj1DkgUcz2c8DTUPVqg==
=i1Tf
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
=pPmt
-----END PGP PUBLIC KEY BLOCK-----
The SaltStack Security Team is available at saltproject-security.pdl@broadcom.com for

5
pkg/rpm/salt.spec
View file

@ -10,8 +10,9 @@
%define __brp_python_hardlink /usr/bin/true
# Disable private libraries from showing in provides
%global __provides_exclude_from ^lib/.*\\.so.*$
%global __requires_exclude_from ^lib/.*\\.so.*$
%global __to_exclude .*\\.so.*
%global __provides_exclude_from ^.*$
%global __requires_exclude_from ^.*$
%define _source_payload w2.gzdio
%define _binary_payload w2.gzdio
%define _SALT_GROUP salt

127
pkg/windows/install_vs_buildtools.ps1
View file

@ -25,6 +25,8 @@ param(
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12
$ProgressPreference = "SilentlyContinue"
$ErrorActionPreference = "Stop"
# https://stackoverflow.com/a/67201331/4581998
$env:PSModulePath = [Environment]::GetEnvironmentVariable('PSModulePath', 'Machine')
#-------------------------------------------------------------------------------
# Script Functions
@ -39,6 +41,43 @@ function Write-Result($result, $ForegroundColor="Green") {
}
}
function Add-Certificate {
[CmdletBinding()]
param(
[Parameter(Mandatory=$true)]
# The path in the certstore (CERT:/LocalMachine/Root/<hash>)
[String] $Path,
[Parameter(Mandatory=$true)]
# The path to the cert file for importing
[String] $File,
[Parameter(Mandatory=$true)]
# The name of the cert file for importing
[String] $Name
)
# Validation
if ( ! (Test-Path -Path $File)) {
Write-Host "Invalid path to certificate file"
exit 1
}
if (! (Test-Path -Path $Path) ) {
Write-Host "Installing Certificate $Name`: " -NoNewLine
$output = Import-Certificate -FilePath $File -CertStoreLocation "Cert:\LocalMachine\Root"
if ( Test-Path -Path $Path ) {
Write-Result "Success"
} else {
Write-Result "Failed" -ForegroundColor Yellow
Write-Host $output
}
}
}
#-------------------------------------------------------------------------------
# Start the Script
#-------------------------------------------------------------------------------
@ -53,25 +92,32 @@ Write-Host $("-" * 80)
# Dependency Variables
$VS_BLD_TOOLS = "https://aka.ms/vs/15/release/vs_buildtools.exe"
$VS_CL_BIN = "${env:ProgramFiles(x86)}\Microsoft Visual Studio 14.0\VC\bin\cl.exe"
$MSBUILD_BIN = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
$WIN10_SDK_RC = "${env:ProgramFiles(x86)}\Windows Kits\10\bin\10.0.17763.0\x64\rc.exe"
try {
# If VS is installed, you will be able to get the WMI Object MSFT_VSInstance
$VS_INST_LOC = $(Get-CimInstance MSFT_VSInstance -Namespace root/cimv2/vs).InstallLocation
$MSBUILD_BIN = $(Get-ChildItem "$VS_INST_LOC\MSBuild\*\Bin\msbuild.exe").FullName
} catch {
# If VS is not installed, this is the fallback for this installation
$MSBUILD_BIN = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
}
#-------------------------------------------------------------------------------
# Visual Studio
#-------------------------------------------------------------------------------
$install_build_tools = $false
Write-Host "Confirming Presence of Visual Studio Build Tools: " -NoNewline
@($VS_CL_BIN, $MSBUILD_BIN, $WIN10_SDK_RC) | ForEach-Object {
if ( ! (Test-Path -Path $_) ) {
$install_build_tools = $true
}
}
if ( $install_build_tools ) {
# We're only gonna look for msbuild.exe
if ( Test-Path -Path $MSBUILD_BIN ) {
Write-Result "Success" -ForegroundColor Green
} else {
Write-Result "Missing" -ForegroundColor Yellow
try {
# If VS is installed, you will be able to get the WMI Object MSFT_VSInstance
Write-Host "Get VS Instance Information"
Get-CimInstance MSFT_VSInstance -Namespace root/cimv2/vs
} catch {}
Write-Host "Checking available disk space: " -NoNewLine
$available = (Get-PSDrive $env:SystemDrive.Trim(":")).Free
if ( $available -gt (1024 * 1024 * 1024 * 9.1) ) {
@ -101,7 +147,6 @@ if ( $install_build_tools ) {
"--add Microsoft.VisualStudio.Workload.MSBuildTools", `
"--add Microsoft.VisualStudio.Workload.VCTools", `
"--add Microsoft.VisualStudio.Component.Windows81SDK", `
"--add Microsoft.VisualStudio.Component.Windows10SDK.17763", `
"--add Microsoft.VisualStudio.Component.VC.140", `
"--lang en-US", `
"--includeRecommended", `
@ -115,51 +160,35 @@ if ( $install_build_tools ) {
exit 1
}
# Serial: 28cc3a25bfba44ac449a9b586b4339a
# Serial: 28cc3a25bfba44ac449a9b586b4339aa
# Hash: 3b1efd3a66ea28b16697394703a72ca340a05bd5
if (! (Test-Path -Path Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5) ) {
Write-Host "Installing Certificate Sign Root Certificate: " -NoNewLine
Start-Process -FilePath "certutil" `
-ArgumentList "-addstore", `
"Root", `
"$($env:TEMP)\build_tools\certificates\manifestCounterSignRootCertificate.cer" `
-Wait -WindowStyle Hidden
if ( Test-Path -Path Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5 ) {
Write-Result "Success" -ForegroundColor Green
} else {
Write-Result "Failed" -ForegroundColor Yellow
}
}
$cert_name = "Sign Root Certificate"
$cert_path = "Cert:\LocalMachine\Root\3b1efd3a66ea28b16697394703a72ca340a05bd5"
$cert_file = "$env:TEMP\build_tools\certificates\manifestCounterSignRootCertificate.cer"
Add-Certificate -Name $cert_name -Path $cert_path -File $cert_file
# Serial: 3f8bc8b5fc9fb29643b569d66c42e144
# Hash: 8f43288ad272f3103b6fb1428485ea3014c0bcfe
if (! (Test-Path -Path Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe) ) {
Write-Host "Installing Certificate Root Certificate: " -NoNewLine
Start-Process -FilePath "certutil" `
-ArgumentList "-addstore", `
"Root", `
"$($env:TEMP)\build_tools\certificates\manifestRootCertificate.cer" `
-Wait -WindowStyle Hidden
if ( Test-Path -Path Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe ) {
Write-Result "Success" -ForegroundColor Green
} else {
Write-Result "Failed" -ForegroundColor Yellow
}
}
$cert_name = "Root Certificate"
$cert_path = "Cert:\LocalMachine\Root\8f43288ad272f3103b6fb1428485ea3014c0bcfe"
$cert_file = "$env:TEMP\build_tools\certificates\manifestRootCertificate.cer"
Add-Certificate -Name $cert_name -Path $cert_path -File $cert_file
Write-Host "Installing Visual Studio 2017 build tools: " -NoNewline
Start-Process -FilePath "$env:TEMP\build_tools\vs_setup.exe" `
-ArgumentList "--wait", "--noweb", "--quiet" `
-Wait
@($VS_CL_BIN, $MSBUILD_BIN, $WIN10_SDK_RC) | ForEach-Object {
if ( ! (Test-Path -Path $_) ) {
Write-Result "Failed" -ForegroundColor Red
exit 1
}
$proc = Start-Process `
-FilePath "$env:TEMP\build_tools\vs_setup.exe" `
-ArgumentList "--wait", "--noweb", "--quiet" `
-PassThru -Wait `
-RedirectStandardOutput "$env:TEMP\stdout.txt"
if ( Test-Path -Path $MSBUILD_BIN ) {
Write-Result "Failed" -ForegroundColor Red
Write-Host "Missing: $_"
Write-Host "ExitCode: $($proc.ExitCode)"
Write-Host "STDOUT:"
Get-Content "$env:TEMP\stdout.txt"
exit 1
}
Write-Result "Success" -ForegroundColor Green
} else {
Write-Result "Success" -ForegroundColor Green
}
#-------------------------------------------------------------------------------

4
requirements/base.txt
View file

@ -5,13 +5,15 @@ jmespath
msgpack>=1.0.0
PyYAML
MarkupSafe
requests>=2.25.1
requests>=2.31.0 ; python_version < '3.8'
requests>=2.32.0 ; python_version >= '3.8'
distro>=1.0.1
psutil>=5.0.0
packaging>=21.3
looseversion
tornado>=6.3.3
aiohttp>=3.9.0
croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
# We need contextvars for salt-ssh.
# Even on python versions which ships with contextvars in the standard library!

3
requirements/pytest.txt
View file

@ -1,6 +1,7 @@
mock >= 3.0.0
# PyTest
docker
docker >= 7.1.0; python_version >= '3.8'
docker < 7.1.0; python_version < '3.8'
pytest >= 7.2.0
pytest-salt-factories >= 1.0.0
pytest-helpers-namespace >= 2019.1.8

1
requirements/static/ci/common.in
View file

@ -12,7 +12,6 @@ certifi>=2022.12.07
cffi>=1.14.6
cherrypy>=17.4.1
clustershell
croniter>=0.3.0,!=0.3.22"; sys_platform != 'win32'
dnspython
etcd3-py==0.1.6
gitpython>=3.1.37

3
requirements/static/ci/lint.in
View file

@ -2,7 +2,8 @@
--constraint=./py{py_version}/{platform}.txt
docker
docker >= 7.1.0; python_version >= '3.8'
docker < 7.1.0; python_version < '3.8'
pylint~=3.1.0
SaltPyLint>=2024.2.2
toml

2
requirements/static/ci/linux.in
View file

@ -3,7 +3,7 @@
pyiface
pygit2>=1.10.1
pymysql>=1.0.2
pymysql>=1.1.1
ansible>=9.1.0; python_version >= '3.10'
twilio
python-telegram-bot>=13.7

2
requirements/static/ci/py3.10/cloud.txt
View file

@ -51,7 +51,7 @@ pywinrm==0.4.3
# via -r requirements/static/ci/cloud.in
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.10/linux.txt
# apache-libcloud

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

@ -99,8 +99,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
@ -122,7 +124,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -288,7 +290,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0
# via
@ -414,6 +415,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -435,7 +437,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
@ -552,9 +554,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -119,7 +119,7 @@ pyyaml==6.0.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# myst-docutils
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.10/linux.txt
# sphinx

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

@ -98,8 +98,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
@ -121,7 +123,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -291,7 +293,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -418,6 +419,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -439,7 +441,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
@ -557,9 +559,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

16
requirements/static/ci/py3.10/lint.txt
View file

@ -16,7 +16,7 @@ charset-normalizer==3.2.0
# requests
dill==0.3.8
# via pylint
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/lint.in
@ -28,10 +28,6 @@ isort==4.3.21
# via pylint
mccabe==0.6.1
# via pylint
packaging==23.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -40,16 +36,12 @@ pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.10/linux.txt
@ -69,7 +61,3 @@ urllib3==1.26.18
# -c requirements/static/ci/py3.10/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# docker

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

@ -111,8 +111,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
@ -135,7 +137,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -317,7 +319,6 @@ packaging==23.1
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# ansible-core
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -380,7 +381,7 @@ pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and plat
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
# via twilio
pymysql==1.1.0
pymysql==1.1.1
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -456,6 +457,7 @@ python-telegram-bot==20.3
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -483,7 +485,7 @@ redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
@ -621,9 +623,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -120,7 +120,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -257,7 +257,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
# docker
# pytest
passlib==1.7.4
# via -r requirements/static/ci/common.in
@ -408,7 +407,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
@ -505,9 +504,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

2
requirements/static/ci/py3.11/cloud.txt
View file

@ -51,7 +51,7 @@ pywinrm==0.4.3
# via -r requirements/static/ci/cloud.in
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.11/linux.txt
# apache-libcloud

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

@ -94,8 +94,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
@ -117,7 +119,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -281,7 +283,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0
# via
@ -407,6 +408,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -428,7 +430,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
@ -543,9 +545,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -119,7 +119,7 @@ pyyaml==6.0.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# myst-docutils
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.11/linux.txt
# sphinx

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

@ -93,8 +93,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
@ -116,7 +118,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -284,7 +286,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -411,6 +412,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -432,7 +434,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
# -r requirements/base.txt
@ -549,9 +551,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

16
requirements/static/ci/py3.11/lint.txt
View file

@ -16,7 +16,7 @@ charset-normalizer==3.2.0
# requests
dill==0.3.8
# via pylint
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/lint.in
@ -28,10 +28,6 @@ isort==4.3.21
# via pylint
mccabe==0.6.1
# via pylint
packaging==23.1
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.11/linux.txt
@ -40,16 +36,12 @@ pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.11/linux.txt
@ -61,7 +53,3 @@ urllib3==1.26.18
# -c requirements/static/ci/py3.11/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# docker

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

@ -106,8 +106,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
@ -130,7 +132,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -308,7 +310,6 @@ packaging==23.1
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
# ansible-core
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -371,7 +372,7 @@ pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and plat
# via -r requirements/static/ci/common.in
pyjwt==2.4.0
# via twilio
pymysql==1.1.0
pymysql==1.1.1
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -447,6 +448,7 @@ python-telegram-bot==20.3
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -474,7 +476,7 @@ redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.11/linux.txt
# -r requirements/base.txt
@ -611,9 +613,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -115,7 +115,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -250,7 +250,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
# docker
# pytest
passlib==1.7.4
# via -r requirements/static/ci/common.in
@ -401,7 +400,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
@ -496,9 +495,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -125,10 +125,11 @@ contextvars==2.4
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -158,7 +159,7 @@ dnspython==2.6.1
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/pytest.txt
@ -397,7 +398,6 @@ packaging==23.1
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -582,6 +582,7 @@ pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via
@ -610,7 +611,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
@ -785,7 +786,6 @@ watchdog==3.0.0
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# docker
# kubernetes
wempy==0.2.1
# via

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

@ -94,8 +94,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
@ -117,7 +119,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -281,7 +283,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0
# via
@ -407,6 +408,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -428,7 +430,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
@ -543,9 +545,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -53,6 +53,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -195,6 +199,7 @@ python-dateutil==2.8.2
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -202,6 +207,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# croniter
# tempora
pyyaml==6.0.1
# via
@ -212,7 +218,7 @@ pyzmq==25.1.2
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt

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

@ -93,8 +93,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
@ -116,7 +118,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -284,7 +286,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -411,6 +412,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -432,7 +434,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
# -r requirements/base.txt
@ -549,9 +551,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -143,10 +143,11 @@ contextvars==2.4
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -174,7 +175,7 @@ dnspython==2.6.1
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/lint.in
@ -425,7 +426,6 @@ packaging==23.1
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
# ansible-core
# docker
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
# -c requirements/static/ci/py3.12/linux.txt
@ -511,7 +511,7 @@ pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
pymysql==1.1.0
pymysql==1.1.1
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/linux.in
@ -570,6 +570,7 @@ pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -603,7 +604,7 @@ redis==3.5.3
# via
# -c requirements/static/ci/py3.12/linux.txt
# redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -c requirements/static/ci/py3.12/linux.txt
@ -792,7 +793,6 @@ watchdog==3.0.0
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# docker
# kubernetes
wempy==0.2.1
# via

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

@ -106,8 +106,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
@ -130,7 +132,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -308,7 +310,6 @@ packaging==23.1
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
# ansible-core
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -371,7 +372,7 @@ pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and plat
# via -r requirements/static/ci/common.in
pyjwt==2.4.0
# via twilio
pymysql==1.1.0
pymysql==1.1.1
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -447,6 +448,7 @@ python-telegram-bot==20.3
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -474,7 +476,7 @@ redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/linux.txt
# -r requirements/base.txt
@ -611,9 +613,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -115,7 +115,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -250,7 +250,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
# docker
# pytest
passlib==1.7.4
# via -r requirements/static/ci/common.in
@ -401,7 +400,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
@ -496,9 +495,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

2
requirements/static/ci/py3.8/cloud.txt
View file

@ -51,7 +51,7 @@ pywinrm==0.4.3
# via -r requirements/static/ci/cloud.in
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.8/linux.txt
# apache-libcloud

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

@ -128,7 +128,7 @@ pyyaml==6.0.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# myst-docutils
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.8/linux.txt
# sphinx

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

@ -98,8 +98,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
@ -121,7 +123,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -295,7 +297,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -422,6 +423,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -443,7 +445,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
# -r requirements/base.txt
@ -562,9 +564,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

16
requirements/static/ci/py3.8/lint.txt
View file

@ -16,7 +16,7 @@ charset-normalizer==3.2.0
# requests
dill==0.3.8
# via pylint
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.8/linux.txt
# -r requirements/static/ci/lint.in
@ -28,10 +28,6 @@ isort==4.3.21
# via pylint
mccabe==0.6.1
# via pylint
packaging==23.1
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -40,16 +36,12 @@ pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.8/linux.txt
@ -70,7 +62,3 @@ urllib3==1.26.18
# -c requirements/static/ci/py3.8/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.8/linux.txt
# docker

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

@ -107,8 +107,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
@ -130,7 +132,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -314,7 +316,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -377,7 +378,7 @@ pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and plat
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
# via twilio
pymysql==1.1.0
pymysql==1.1.1
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -453,6 +454,7 @@ python-telegram-bot==20.3
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -479,7 +481,7 @@ redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.8/linux.txt
# -r requirements/base.txt
@ -614,9 +616,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -120,7 +120,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -261,7 +261,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
# docker
# pytest
passlib==1.7.4
# via -r requirements/static/ci/common.in
@ -413,7 +412,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.8/windows.txt
# -r requirements/base.txt
@ -511,9 +510,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

2
requirements/static/ci/py3.9/cloud.txt
View file

@ -51,7 +51,7 @@ pywinrm==0.4.3
# via -r requirements/static/ci/cloud.in
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.9/linux.txt
# apache-libcloud

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

@ -99,8 +99,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
@ -122,7 +124,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -288,7 +290,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0
# via
@ -414,6 +415,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -435,7 +437,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
# -r requirements/base.txt
@ -552,9 +554,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -123,7 +123,7 @@ pyyaml==6.0.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# myst-docutils
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.9/linux.txt
# sphinx

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

@ -98,8 +98,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
@ -121,7 +123,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -291,7 +293,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -418,6 +419,7 @@ python-gnupg==0.5.2
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# croniter
# tempora
pyvmomi==8.0.1.0.1
# via -r requirements/static/ci/common.in
@ -439,7 +441,7 @@ pyzmq==25.1.2
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/zeromq.txt
# pytest-salt-factories
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
# -r requirements/base.txt
@ -557,9 +559,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

16
requirements/static/ci/py3.9/lint.txt
View file

@ -16,7 +16,7 @@ charset-normalizer==3.2.0
# requests
dill==0.3.8
# via pylint
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.9/linux.txt
# -r requirements/static/ci/lint.in
@ -28,10 +28,6 @@ isort==4.3.21
# via pylint
mccabe==0.6.1
# via pylint
packaging==23.1
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker
platformdirs==4.0.0
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -40,16 +36,12 @@ pylint==3.1.0
# via
# -r requirements/static/ci/lint.in
# saltpylint
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker
saltpylint==2024.2.5
# via -r requirements/static/ci/lint.in
six==1.16.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# websocket-client
toml==0.10.2
# via
# -c requirements/static/ci/py3.9/linux.txt
@ -70,7 +62,3 @@ urllib3==1.26.18
# -c requirements/static/ci/py3.9/linux.txt
# docker
# requests
websocket-client==0.40.0
# via
# -c requirements/static/ci/py3.9/linux.txt
# docker

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

@ -107,8 +107,10 @@ contextvars==2.4
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
croniter==1.3.15 ; sys_platform != "win32"
# via -r requirements/static/ci/common.in
croniter==2.0.5 ; sys_platform != "win32"
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
cryptography==42.0.5
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
@ -130,7 +132,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -310,7 +312,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
# docker
# pytest
paramiko==3.4.0 ; sys_platform != "win32" and sys_platform != "darwin"
# via
@ -373,7 +374,7 @@ pyinotify==0.9.6 ; sys_platform != "win32" and sys_platform != "darwin" and plat
# via -r requirements/static/ci/common.in
pyjwt==2.7.0
# via twilio
pymysql==1.1.0
pymysql==1.1.1
# via -r requirements/static/ci/linux.in
pynacl==1.5.0
# via
@ -449,6 +450,7 @@ python-telegram-bot==20.3
pytz==2024.1
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# croniter
# tempora
# twilio
pyvmomi==8.0.1.0.1
@ -475,7 +477,7 @@ redis-py-cluster==2.1.3
# via -r requirements/static/ci/linux.in
redis==3.5.3
# via redis-py-cluster
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.9/linux.txt
# -r requirements/base.txt
@ -609,9 +611,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -120,7 +120,7 @@ dnspython==2.6.1
# via
# -r requirements/static/ci/common.in
# python-etcd
docker==6.1.3
docker==7.1.0 ; python_version >= "3.8"
# via -r requirements/pytest.txt
etcd3-py==0.1.6
# via -r requirements/static/ci/common.in
@ -257,7 +257,6 @@ packaging==23.1
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
# docker
# pytest
passlib==1.7.4
# via -r requirements/static/ci/common.in
@ -409,7 +408,7 @@ pyzmq==25.1.2
# pytest-salt-factories
requests-ntlm==1.2.0
# via pywinrm
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via
# -c requirements/static/ci/../pkg/py3.9/windows.txt
# -r requirements/base.txt
@ -506,9 +505,7 @@ virtualenv==20.24.7
watchdog==3.0.0
# via -r requirements/static/ci/common.in
websocket-client==0.40.0
# via
# docker
# kubernetes
# via kubernetes
wempy==0.2.1
# via -r requirements/static/ci/common.in
werkzeug==3.0.3

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

@ -28,6 +28,8 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via -r requirements/base.txt
cryptography==42.0.5
# via
# -r requirements/base.txt
@ -98,16 +100,20 @@ pydantic==2.6.4
pyopenssl==24.0.0
# via -r requirements/base.txt
python-dateutil==2.8.2
# via -r requirements/base.txt
# via
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via -r requirements/base.txt
pytz==2024.1
# via tempora
# via
# croniter
# tempora
pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
setproctitle==1.3.2
# via -r requirements/base.txt

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

@ -28,6 +28,8 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via -r requirements/base.txt
cryptography==42.0.5
# via
# -r requirements/base.txt
@ -98,16 +100,20 @@ pydantic==2.6.4
pyopenssl==24.0.0
# via -r requirements/base.txt
python-dateutil==2.8.2
# via -r requirements/base.txt
# via
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via -r requirements/base.txt
pytz==2024.1
# via tempora
# via
# croniter
# tempora
pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
setproctitle==1.3.2
# via -r requirements/base.txt

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

@ -28,6 +28,8 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via -r requirements/base.txt
cryptography==42.0.5
# via
# -r requirements/base.txt
@ -98,16 +100,20 @@ pydantic==2.6.4
pyopenssl==24.0.0
# via -r requirements/base.txt
python-dateutil==2.8.2
# via -r requirements/base.txt
# via
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via -r requirements/base.txt
pytz==2024.1
# via tempora
# via
# croniter
# tempora
pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
rpm-vercmp==0.1.2 ; sys_platform == "linux"
# via -r requirements/base.txt

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

@ -127,7 +127,7 @@ pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
setproctitle==1.3.2
# via -r requirements/base.txt

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

@ -26,6 +26,8 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via -r requirements/base.txt
cryptography==42.0.5
# via
# -r requirements/base.txt
@ -96,16 +98,20 @@ pydantic==2.6.4
pyopenssl==24.0.0
# via -r requirements/base.txt
python-dateutil==2.8.2
# via -r requirements/base.txt
# via
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via -r requirements/base.txt
pytz==2024.1
# via tempora
# via
# croniter
# tempora
pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
setproctitle==1.3.2
# via -r requirements/base.txt

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

@ -26,6 +26,8 @@ cherrypy==18.8.0
# via -r requirements/base.txt
contextvars==2.4
# via -r requirements/base.txt
croniter==2.0.5 ; sys_platform != "win32"
# via -r requirements/base.txt
cryptography==42.0.5
# via
# -r requirements/base.txt
@ -96,16 +98,20 @@ pydantic==2.6.4
pyopenssl==24.0.0
# via -r requirements/base.txt
python-dateutil==2.8.2
# via -r requirements/base.txt
# via
# -r requirements/base.txt
# croniter
python-gnupg==0.5.2
# via -r requirements/base.txt
pytz==2024.1
# via tempora
# via
# croniter
# tempora
pyyaml==6.0.1
# via -r requirements/base.txt
pyzmq==25.1.2
# via -r requirements/zeromq.txt
requests==2.31.0
requests==2.32.3 ; python_version >= "3.8"
# via -r requirements/base.txt
setproctitle==1.3.2
# via -r requirements/base.txt

Some files were not shown because too many files have changed in this diff Show more