diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e00c54ef348..a64c29957c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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.1" + 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.1" + 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.1" + 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.1" + relenv-version: "0.17.0" python-version: "3.10.14" source: "src" build-ci-deps: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index d3b4d817ed4..ed9f9c70740 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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.1" + 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.1" + 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.1" + 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.1" + relenv-version: "0.17.0" python-version: "3.10.14" source: "src" environment: nightly diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index e2abbfe2622..37e50f5d98d 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -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.1" + 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.1" + 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.1" + 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.1" + relenv-version: "0.17.0" python-version: "3.10.14" source: "src" build-ci-deps: diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 65b121e8fe3..1a1160f7521 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -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.1" + 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.1" + 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.1" + 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.1" + relenv-version: "0.17.0" python-version: "3.10.14" source: "src" environment: staging diff --git a/changelog/50196.fixed.md b/changelog/50196.fixed.md new file mode 100644 index 00000000000..979411a640d --- /dev/null +++ b/changelog/50196.fixed.md @@ -0,0 +1 @@ +Made slsutil.renderer work with salt-ssh diff --git a/changelog/51605.fixed.md b/changelog/51605.fixed.md new file mode 100644 index 00000000000..990b34413d9 --- /dev/null +++ b/changelog/51605.fixed.md @@ -0,0 +1 @@ +Fixed defaults.merge is not available when using salt-ssh diff --git a/changelog/56441.fixed.md b/changelog/56441.fixed.md new file mode 100644 index 00000000000..489ad80f770 --- /dev/null +++ b/changelog/56441.fixed.md @@ -0,0 +1 @@ +Fixed config.get does not support merge option with salt-ssh diff --git a/changelog/61100.fixed.md b/changelog/61100.fixed.md new file mode 100644 index 00000000000..d7ac2b6bc3f --- /dev/null +++ b/changelog/61100.fixed.md @@ -0,0 +1 @@ +Fixed state.test does not work with salt-ssh diff --git a/changelog/61143.fixed.md b/changelog/61143.fixed.md new file mode 100644 index 00000000000..08a62c9d8b1 --- /dev/null +++ b/changelog/61143.fixed.md @@ -0,0 +1 @@ +Made slsutil.findup work with salt-ssh diff --git a/changelog/64563.fixed.md b/changelog/64563.fixed.md new file mode 100644 index 00000000000..fadd9721fed --- /dev/null +++ b/changelog/64563.fixed.md @@ -0,0 +1 @@ +Fixed incorrect version argument will be ignored for multiple package targets warning when using pkgs argument to yumpkg module. diff --git a/changelog/64728.fixed.md b/changelog/64728.fixed.md new file mode 100644 index 00000000000..afe36f42316 --- /dev/null +++ b/changelog/64728.fixed.md @@ -0,0 +1 @@ +salt-cloud honors root_dir config setting for log_file location and fixes for root_dir locations on windows. diff --git a/changelog/65067.fixed.md b/changelog/65067.fixed.md new file mode 100644 index 00000000000..d6de87b5bc1 --- /dev/null +++ b/changelog/65067.fixed.md @@ -0,0 +1 @@ +Fixed slsutil.update with salt-ssh during template rendering diff --git a/changelog/65630.fixed.md b/changelog/65630.fixed.md new file mode 100644 index 00000000000..e8650abcdc1 --- /dev/null +++ b/changelog/65630.fixed.md @@ -0,0 +1 @@ +Added SSH wrapper for logmod diff --git a/changelog/66663.fixed.md b/changelog/66663.fixed.md new file mode 100644 index 00000000000..14a40b4730e --- /dev/null +++ b/changelog/66663.fixed.md @@ -0,0 +1 @@ +Upgrade relenv to 0.17.0 (https://github.com/saltstack/relenv/blob/v0.17.0/CHANGELOG.md) diff --git a/changelog/66666.fixed.md b/changelog/66666.fixed.md new file mode 100644 index 00000000000..076088f4d0c --- /dev/null +++ b/changelog/66666.fixed.md @@ -0,0 +1,4 @@ +Upgrade dependencies due to security issues: +- pymysql>=1.1.1 +- requests>=2.32.0 +- docker>=7.1.0 diff --git a/cicd/shared-gh-workflows-context.yml b/cicd/shared-gh-workflows-context.yml index 647f12465e0..68a5dd25541 100644 --- a/cicd/shared-gh-workflows-context.yml +++ b/cicd/shared-gh-workflows-context.yml @@ -1,6 +1,6 @@ nox_version: "2022.8.7" python_version: "3.10.14" -relenv_version: "0.16.1" +relenv_version: "0.17.0" release_branches: - "3006.x" - "3007.x" diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 7729e61dbcd..3db59a1aa1a 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -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`` diff --git a/requirements/base.txt b/requirements/base.txt index 2cc654cc6aa..e6ab6f051c4 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -5,7 +5,8 @@ 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 diff --git a/requirements/pytest.txt b/requirements/pytest.txt index d53137d6601..ce8b9569125 100644 --- a/requirements/pytest.txt +++ b/requirements/pytest.txt @@ -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 diff --git a/requirements/static/ci/lint.in b/requirements/static/ci/lint.in index 615bf80187e..d98d16af7ad 100644 --- a/requirements/static/ci/lint.in +++ b/requirements/static/ci/lint.in @@ -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 diff --git a/requirements/static/ci/linux.in b/requirements/static/ci/linux.in index 8d247386d61..c52c53dc58b 100644 --- a/requirements/static/ci/linux.in +++ b/requirements/static/ci/linux.in @@ -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 diff --git a/requirements/static/ci/py3.10/cloud.txt b/requirements/static/ci/py3.10/cloud.txt index 91ba901e5d6..e439ead8583 100644 --- a/requirements/static/ci/py3.10/cloud.txt +++ b/requirements/static/ci/py3.10/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.10/darwin.txt b/requirements/static/ci/py3.10/darwin.txt index 3c42d1380ed..cbf72ae9d3a 100644 --- a/requirements/static/ci/py3.10/darwin.txt +++ b/requirements/static/ci/py3.10/darwin.txt @@ -124,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 @@ -290,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 @@ -438,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 @@ -555,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 diff --git a/requirements/static/ci/py3.10/docs.txt b/requirements/static/ci/py3.10/docs.txt index aede008af76..3eef9acc60d 100644 --- a/requirements/static/ci/py3.10/docs.txt +++ b/requirements/static/ci/py3.10/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.10/freebsd.txt b/requirements/static/ci/py3.10/freebsd.txt index 047326ddd1c..e6a7f7cc26a 100644 --- a/requirements/static/ci/py3.10/freebsd.txt +++ b/requirements/static/ci/py3.10/freebsd.txt @@ -123,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 @@ -293,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 @@ -442,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 @@ -560,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 diff --git a/requirements/static/ci/py3.10/lint.txt b/requirements/static/ci/py3.10/lint.txt index b6f98be4fbc..6be00f6c5bc 100644 --- a/requirements/static/ci/py3.10/lint.txt +++ b/requirements/static/ci/py3.10/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.10/linux.txt b/requirements/static/ci/py3.10/linux.txt index cfb04d1af19..34906f5148c 100644 --- a/requirements/static/ci/py3.10/linux.txt +++ b/requirements/static/ci/py3.10/linux.txt @@ -137,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 @@ -319,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 @@ -382,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 @@ -486,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 @@ -624,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 diff --git a/requirements/static/ci/py3.10/windows.txt b/requirements/static/ci/py3.10/windows.txt index b44b18c7c33..496f104398f 100644 --- a/requirements/static/ci/py3.10/windows.txt +++ b/requirements/static/ci/py3.10/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.11/cloud.txt b/requirements/static/ci/py3.11/cloud.txt index 8a67c085503..5045e69e9b5 100644 --- a/requirements/static/ci/py3.11/cloud.txt +++ b/requirements/static/ci/py3.11/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.11/darwin.txt b/requirements/static/ci/py3.11/darwin.txt index fafb9c5cafa..ff4f6b7e032 100644 --- a/requirements/static/ci/py3.11/darwin.txt +++ b/requirements/static/ci/py3.11/darwin.txt @@ -119,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 @@ -283,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 @@ -431,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 @@ -546,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 diff --git a/requirements/static/ci/py3.11/docs.txt b/requirements/static/ci/py3.11/docs.txt index 977ff2ab4ab..ffa33dbcf7e 100644 --- a/requirements/static/ci/py3.11/docs.txt +++ b/requirements/static/ci/py3.11/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.11/freebsd.txt b/requirements/static/ci/py3.11/freebsd.txt index f7599354bdd..6e324cc5f4c 100644 --- a/requirements/static/ci/py3.11/freebsd.txt +++ b/requirements/static/ci/py3.11/freebsd.txt @@ -118,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 @@ -286,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 @@ -435,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 @@ -552,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 diff --git a/requirements/static/ci/py3.11/lint.txt b/requirements/static/ci/py3.11/lint.txt index e62650519db..150c35069c6 100644 --- a/requirements/static/ci/py3.11/lint.txt +++ b/requirements/static/ci/py3.11/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.11/linux.txt b/requirements/static/ci/py3.11/linux.txt index e83c57d9d43..5a2f15856d0 100644 --- a/requirements/static/ci/py3.11/linux.txt +++ b/requirements/static/ci/py3.11/linux.txt @@ -132,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 +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 @@ -373,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 @@ -477,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 @@ -614,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 diff --git a/requirements/static/ci/py3.11/windows.txt b/requirements/static/ci/py3.11/windows.txt index 7a81cb86731..2b77f8cb01a 100644 --- a/requirements/static/ci/py3.11/windows.txt +++ b/requirements/static/ci/py3.11/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.12/cloud.txt b/requirements/static/ci/py3.12/cloud.txt index 35169e6b5ab..41f14034d18 100644 --- a/requirements/static/ci/py3.12/cloud.txt +++ b/requirements/static/ci/py3.12/cloud.txt @@ -159,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 @@ -398,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 @@ -612,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 @@ -787,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 diff --git a/requirements/static/ci/py3.12/darwin.txt b/requirements/static/ci/py3.12/darwin.txt index 0c50eae6cb1..f77e05e5ddf 100644 --- a/requirements/static/ci/py3.12/darwin.txt +++ b/requirements/static/ci/py3.12/darwin.txt @@ -119,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 @@ -283,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 @@ -431,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 @@ -546,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 diff --git a/requirements/static/ci/py3.12/docs.txt b/requirements/static/ci/py3.12/docs.txt index fd7eed73cf3..acfaab6194d 100644 --- a/requirements/static/ci/py3.12/docs.txt +++ b/requirements/static/ci/py3.12/docs.txt @@ -218,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 diff --git a/requirements/static/ci/py3.12/freebsd.txt b/requirements/static/ci/py3.12/freebsd.txt index 3d7191b3463..a293d6e0945 100644 --- a/requirements/static/ci/py3.12/freebsd.txt +++ b/requirements/static/ci/py3.12/freebsd.txt @@ -118,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 @@ -286,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 @@ -435,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 @@ -552,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 diff --git a/requirements/static/ci/py3.12/lint.txt b/requirements/static/ci/py3.12/lint.txt index a0fcd76148b..2196c275bf3 100644 --- a/requirements/static/ci/py3.12/lint.txt +++ b/requirements/static/ci/py3.12/lint.txt @@ -175,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 @@ -426,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 @@ -512,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 @@ -605,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 @@ -794,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 diff --git a/requirements/static/ci/py3.12/linux.txt b/requirements/static/ci/py3.12/linux.txt index 07f2df6a352..6e9d2f93e15 100644 --- a/requirements/static/ci/py3.12/linux.txt +++ b/requirements/static/ci/py3.12/linux.txt @@ -132,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 +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 @@ -373,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 @@ -477,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 @@ -614,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 diff --git a/requirements/static/ci/py3.12/windows.txt b/requirements/static/ci/py3.12/windows.txt index b72ee62f583..e4380533d61 100644 --- a/requirements/static/ci/py3.12/windows.txt +++ b/requirements/static/ci/py3.12/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.8/cloud.txt b/requirements/static/ci/py3.8/cloud.txt index e530f8b033d..6dc77976817 100644 --- a/requirements/static/ci/py3.8/cloud.txt +++ b/requirements/static/ci/py3.8/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.8/docs.txt b/requirements/static/ci/py3.8/docs.txt index 355d8672e67..ff2a746c40a 100644 --- a/requirements/static/ci/py3.8/docs.txt +++ b/requirements/static/ci/py3.8/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.8/freebsd.txt b/requirements/static/ci/py3.8/freebsd.txt index 7a757f325b3..94c0f247d1a 100644 --- a/requirements/static/ci/py3.8/freebsd.txt +++ b/requirements/static/ci/py3.8/freebsd.txt @@ -123,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 @@ -297,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 @@ -446,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 @@ -565,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 diff --git a/requirements/static/ci/py3.8/lint.txt b/requirements/static/ci/py3.8/lint.txt index e2031243152..085b21ecd1d 100644 --- a/requirements/static/ci/py3.8/lint.txt +++ b/requirements/static/ci/py3.8/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.8/linux.txt b/requirements/static/ci/py3.8/linux.txt index bb23a6f5748..55faa78e308 100644 --- a/requirements/static/ci/py3.8/linux.txt +++ b/requirements/static/ci/py3.8/linux.txt @@ -132,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 @@ -316,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 @@ -379,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 @@ -482,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 @@ -617,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 diff --git a/requirements/static/ci/py3.8/windows.txt b/requirements/static/ci/py3.8/windows.txt index b8ececd507d..2099586ca2c 100644 --- a/requirements/static/ci/py3.8/windows.txt +++ b/requirements/static/ci/py3.8/windows.txt @@ -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 diff --git a/requirements/static/ci/py3.9/cloud.txt b/requirements/static/ci/py3.9/cloud.txt index d43e5af5786..f3c308bb055 100644 --- a/requirements/static/ci/py3.9/cloud.txt +++ b/requirements/static/ci/py3.9/cloud.txt @@ -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 diff --git a/requirements/static/ci/py3.9/darwin.txt b/requirements/static/ci/py3.9/darwin.txt index 244cf3db7d6..a364e46cc2a 100644 --- a/requirements/static/ci/py3.9/darwin.txt +++ b/requirements/static/ci/py3.9/darwin.txt @@ -124,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 @@ -290,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 @@ -438,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 @@ -555,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 diff --git a/requirements/static/ci/py3.9/docs.txt b/requirements/static/ci/py3.9/docs.txt index 5aeec7e9253..320123d7592 100644 --- a/requirements/static/ci/py3.9/docs.txt +++ b/requirements/static/ci/py3.9/docs.txt @@ -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 diff --git a/requirements/static/ci/py3.9/freebsd.txt b/requirements/static/ci/py3.9/freebsd.txt index 24a9742d1ec..d4a44882aea 100644 --- a/requirements/static/ci/py3.9/freebsd.txt +++ b/requirements/static/ci/py3.9/freebsd.txt @@ -123,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 @@ -293,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 @@ -442,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 @@ -560,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 diff --git a/requirements/static/ci/py3.9/lint.txt b/requirements/static/ci/py3.9/lint.txt index 9dfbc27a332..92d500abf59 100644 --- a/requirements/static/ci/py3.9/lint.txt +++ b/requirements/static/ci/py3.9/lint.txt @@ -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 diff --git a/requirements/static/ci/py3.9/linux.txt b/requirements/static/ci/py3.9/linux.txt index 2ce6f8c2fcc..dd4d0c1630a 100644 --- a/requirements/static/ci/py3.9/linux.txt +++ b/requirements/static/ci/py3.9/linux.txt @@ -132,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 @@ -312,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 @@ -375,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 @@ -478,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 @@ -612,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 diff --git a/requirements/static/ci/py3.9/windows.txt b/requirements/static/ci/py3.9/windows.txt index 7cbe9e15ad1..5c610222c6b 100644 --- a/requirements/static/ci/py3.9/windows.txt +++ b/requirements/static/ci/py3.9/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.10/darwin.txt b/requirements/static/pkg/py3.10/darwin.txt index 6369253f7fd..d5b06ea94c7 100644 --- a/requirements/static/pkg/py3.10/darwin.txt +++ b/requirements/static/pkg/py3.10/darwin.txt @@ -113,7 +113,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 diff --git a/requirements/static/pkg/py3.10/freebsd.txt b/requirements/static/pkg/py3.10/freebsd.txt index b5021bd8079..3fd122e574d 100644 --- a/requirements/static/pkg/py3.10/freebsd.txt +++ b/requirements/static/pkg/py3.10/freebsd.txt @@ -113,7 +113,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 diff --git a/requirements/static/pkg/py3.10/linux.txt b/requirements/static/pkg/py3.10/linux.txt index 1a9a5beaba7..7f7f059baf3 100644 --- a/requirements/static/pkg/py3.10/linux.txt +++ b/requirements/static/pkg/py3.10/linux.txt @@ -113,7 +113,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 rpm-vercmp==0.1.2 ; sys_platform == "linux" # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.10/windows.txt b/requirements/static/pkg/py3.10/windows.txt index e394963e9f2..b44be8971f8 100644 --- a/requirements/static/pkg/py3.10/windows.txt +++ b/requirements/static/pkg/py3.10/windows.txt @@ -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 diff --git a/requirements/static/pkg/py3.11/darwin.txt b/requirements/static/pkg/py3.11/darwin.txt index 4500b45f71e..db6c4d08a5a 100644 --- a/requirements/static/pkg/py3.11/darwin.txt +++ b/requirements/static/pkg/py3.11/darwin.txt @@ -111,7 +111,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 diff --git a/requirements/static/pkg/py3.11/freebsd.txt b/requirements/static/pkg/py3.11/freebsd.txt index b4b8f357c35..99d25ff7113 100644 --- a/requirements/static/pkg/py3.11/freebsd.txt +++ b/requirements/static/pkg/py3.11/freebsd.txt @@ -111,7 +111,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 diff --git a/requirements/static/pkg/py3.11/linux.txt b/requirements/static/pkg/py3.11/linux.txt index 52b19d42729..4f25b2b1030 100644 --- a/requirements/static/pkg/py3.11/linux.txt +++ b/requirements/static/pkg/py3.11/linux.txt @@ -111,7 +111,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 rpm-vercmp==0.1.2 ; sys_platform == "linux" # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.11/windows.txt b/requirements/static/pkg/py3.11/windows.txt index c2ff838f42a..6815187d2a4 100644 --- a/requirements/static/pkg/py3.11/windows.txt +++ b/requirements/static/pkg/py3.11/windows.txt @@ -125,7 +125,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 diff --git a/requirements/static/pkg/py3.12/darwin.txt b/requirements/static/pkg/py3.12/darwin.txt index 9d9dc83ab32..51020f0170a 100644 --- a/requirements/static/pkg/py3.12/darwin.txt +++ b/requirements/static/pkg/py3.12/darwin.txt @@ -111,7 +111,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 diff --git a/requirements/static/pkg/py3.12/freebsd.txt b/requirements/static/pkg/py3.12/freebsd.txt index fc76af666ce..95bedeebbe5 100644 --- a/requirements/static/pkg/py3.12/freebsd.txt +++ b/requirements/static/pkg/py3.12/freebsd.txt @@ -111,7 +111,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 diff --git a/requirements/static/pkg/py3.12/linux.txt b/requirements/static/pkg/py3.12/linux.txt index d0a514043d6..1da1d6f25a0 100644 --- a/requirements/static/pkg/py3.12/linux.txt +++ b/requirements/static/pkg/py3.12/linux.txt @@ -111,7 +111,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 rpm-vercmp==0.1.2 ; sys_platform == "linux" # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.12/windows.txt b/requirements/static/pkg/py3.12/windows.txt index 9221269e9a8..3b5b7009c04 100644 --- a/requirements/static/pkg/py3.12/windows.txt +++ b/requirements/static/pkg/py3.12/windows.txt @@ -125,7 +125,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 diff --git a/requirements/static/pkg/py3.8/freebsd.txt b/requirements/static/pkg/py3.8/freebsd.txt index 398f361a814..1097495bedd 100644 --- a/requirements/static/pkg/py3.8/freebsd.txt +++ b/requirements/static/pkg/py3.8/freebsd.txt @@ -115,7 +115,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 diff --git a/requirements/static/pkg/py3.8/linux.txt b/requirements/static/pkg/py3.8/linux.txt index f2e5a7f6a4b..e144ef6b5a0 100644 --- a/requirements/static/pkg/py3.8/linux.txt +++ b/requirements/static/pkg/py3.8/linux.txt @@ -115,7 +115,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 rpm-vercmp==0.1.2 ; sys_platform == "linux" # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.8/windows.txt b/requirements/static/pkg/py3.8/windows.txt index 0c12c435da2..11d7cf6d112 100644 --- a/requirements/static/pkg/py3.8/windows.txt +++ b/requirements/static/pkg/py3.8/windows.txt @@ -130,7 +130,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 diff --git a/requirements/static/pkg/py3.9/darwin.txt b/requirements/static/pkg/py3.9/darwin.txt index 41978ad919e..47ef9bfda36 100644 --- a/requirements/static/pkg/py3.9/darwin.txt +++ b/requirements/static/pkg/py3.9/darwin.txt @@ -113,7 +113,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 diff --git a/requirements/static/pkg/py3.9/freebsd.txt b/requirements/static/pkg/py3.9/freebsd.txt index f89cf7b60c3..bde4cdef69b 100644 --- a/requirements/static/pkg/py3.9/freebsd.txt +++ b/requirements/static/pkg/py3.9/freebsd.txt @@ -113,7 +113,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 diff --git a/requirements/static/pkg/py3.9/linux.txt b/requirements/static/pkg/py3.9/linux.txt index d1aeb8de1b2..44e4bb6ef18 100644 --- a/requirements/static/pkg/py3.9/linux.txt +++ b/requirements/static/pkg/py3.9/linux.txt @@ -113,7 +113,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 rpm-vercmp==0.1.2 ; sys_platform == "linux" # via -r requirements/base.txt diff --git a/requirements/static/pkg/py3.9/windows.txt b/requirements/static/pkg/py3.9/windows.txt index a9a4aa82d64..b85fe898451 100644 --- a/requirements/static/pkg/py3.9/windows.txt +++ b/requirements/static/pkg/py3.9/windows.txt @@ -128,7 +128,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 diff --git a/salt/config/__init__.py b/salt/config/__init__.py index 00439f1526d..7cf0261a017 100644 --- a/salt/config/__init__.py +++ b/salt/config/__init__.py @@ -2226,6 +2226,18 @@ def include_config(include, orig_path, verbose, exit_on_config_errors=False): return configuration +def should_prepend_root_dir(key, opts): + """ + Prepend root dir only when the key exists, has a value, and that value is + not a URI. + """ + return ( + key in opts + and opts[key] is not None + and urllib.parse.urlparse(os.path.splitdrive(opts[key])[1]).scheme == "" + ) + + def prepend_root_dir(opts, path_options): """ Prepends the options that represent filesystem paths with value of the @@ -2522,8 +2534,7 @@ def syndic_config( "autosign_grains_dir", ] for config_key in ("log_file", "key_logfile", "syndic_log_file"): - # If this is not a URI and instead a local path - if urllib.parse.urlparse(opts.get(config_key, "")).scheme == "": + if should_prepend_root_dir(config_key, opts): prepend_root_dirs.append(config_key) prepend_root_dir(opts, prepend_root_dirs) salt.features.setup_features(opts) @@ -2775,8 +2786,8 @@ def cloud_config( # prepend root_dir prepend_root_dirs = ["cachedir"] - if "log_file" in opts and urllib.parse.urlparse(opts["log_file"]).scheme == "": - prepend_root_dirs.append(opts["log_file"]) + if should_prepend_root_dir("log_file", opts): + prepend_root_dirs.append("log_file") prepend_root_dir(opts, prepend_root_dirs) salt.features.setup_features(opts) @@ -3848,7 +3859,7 @@ def apply_minion_config( # These can be set to syslog, so, not actual paths on the system for config_key in ("log_file", "key_logfile"): - if urllib.parse.urlparse(opts.get(config_key, "")).scheme == "": + if should_prepend_root_dir(config_key, opts): prepend_root_dirs.append(config_key) prepend_root_dir(opts, prepend_root_dirs) @@ -4086,11 +4097,7 @@ def apply_master_config(overrides=None, defaults=None): # These can be set to syslog, so, not actual paths on the system for config_key in ("log_file", "key_logfile", "ssh_log_file"): - log_setting = opts.get(config_key, "") - if log_setting is None: - continue - - if urllib.parse.urlparse(log_setting).scheme == "": + if should_prepend_root_dir(config_key, opts): prepend_root_dirs.append(config_key) prepend_root_dir(opts, prepend_root_dirs) @@ -4318,11 +4325,7 @@ def apply_spm_config(overrides, defaults): # These can be set to syslog, so, not actual paths on the system for config_key in ("spm_logfile",): - log_setting = opts.get(config_key, "") - if log_setting is None: - continue - - if urllib.parse.urlparse(log_setting).scheme == "": + if should_prepend_root_dir(config_key, opts): prepend_root_dirs.append(config_key) prepend_root_dir(opts, prepend_root_dirs) diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index 01c0726d49f..fccf095fcc9 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -1427,8 +1427,8 @@ def install( 'version': '', 'arch': ''}}} """ - if "version" in kwargs: - kwargs["version"] = str(kwargs["version"]) + if (version := kwargs.get("version")) is not None: + kwargs["version"] = str(version) options = _get_options(**kwargs) if salt.utils.data.is_true(refresh): diff --git a/salt/states/virtualenv_mod.py b/salt/states/virtualenv_mod.py index 957f44265bc..7dadfa23fd5 100644 --- a/salt/states/virtualenv_mod.py +++ b/salt/states/virtualenv_mod.py @@ -77,7 +77,9 @@ def managed( Prefer wheel archives (requires pip >= 1.4). python: None - Python executable used to build the virtualenv + Python executable used to build the virtualenv. When Salt is installed + from a onedir package. You will likely want to specify which python + interperter should be used. user: None The user under which to run virtualenv and pip. @@ -131,6 +133,12 @@ def managed( - requirements: salt://REQUIREMENTS.txt - env_vars: PATH_VAR: '/usr/local/bin/' + + Current versions of Salt use onedir packages and will use onedir python + interpreter by default. If you've installed Salt via out package + repository. You will likely want to provide the path to the interpreter + with wich you would like to be used to create the virtual envrionment. The + interperter can be specified by providing the `python` option. """ ret = {"name": name, "result": True, "comment": "", "changes": {}} diff --git a/tests/pytests/functional/states/test_pkg.py b/tests/pytests/functional/states/test_pkg.py index 5ae52c32f28..a178d2f2cc6 100644 --- a/tests/pytests/functional/states/test_pkg.py +++ b/tests/pytests/functional/states/test_pkg.py @@ -231,7 +231,7 @@ def test_pkg_002_installed_with_version(PKG_TARGETS, states, latest_version): @pytest.mark.requires_salt_states("pkg.installed", "pkg.removed") @pytest.mark.slow_test -def test_pkg_003_installed_multipkg(PKG_TARGETS, modules, states): +def test_pkg_003_installed_multipkg(caplog, PKG_TARGETS, modules, states): """ This is a destructive test as it installs and then removes two packages """ @@ -247,6 +247,7 @@ def test_pkg_003_installed_multipkg(PKG_TARGETS, modules, states): try: ret = states.pkg.installed(name=None, pkgs=PKG_TARGETS, refresh=False) assert ret.result is True + assert "WARNING" not in caplog.text finally: ret = states.pkg.removed(name=None, pkgs=PKG_TARGETS) assert ret.result is True diff --git a/tests/pytests/functional/test_config.py b/tests/pytests/functional/test_config.py index 76d25118f4a..9417c1b6751 100644 --- a/tests/pytests/functional/test_config.py +++ b/tests/pytests/functional/test_config.py @@ -5,6 +5,7 @@ import tempfile import pytest import salt.config +import salt.utils.platform pytestmark = [ pytest.mark.windows_whitelisted, @@ -25,3 +26,128 @@ def test_minion_config_type_check(caplog): assert msg not in caplog.text finally: os.remove(path) + + +def test_cloud_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + cloud_config = config_path / "cloud" + cloud_config.write_text("") + master_config = config_path / "master" + master_config.write_text(f"root_dir: {root_path}") + opts = salt.config.cloud_config(cloud_config) + assert opts["log_file"] == str(root_path / "var" / "log" / "salt" / "cloud") + assert opts["cachedir"] == str(root_path / "var" / "cache" / "salt" / "cloud") + + +def test_master_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + master_config = config_path / "master" + master_config.write_text(f"root_dir: {root_path}") + opts = salt.config.master_config(master_config) + if salt.utils.platform.is_windows(): + assert opts["pki_dir"] == str(root_path / "conf" / "pki" / "master") + else: + assert opts["pki_dir"] == str(root_path / "etc" / "salt" / "pki" / "master") + assert opts["cachedir"] == str(root_path / "var" / "cache" / "salt" / "master") + assert opts["pidfile"] == str(root_path / "var" / "run" / "salt-master.pid") + assert opts["sock_dir"] == str(root_path / "var" / "run" / "salt" / "master") + assert opts["extension_modules"] == str( + root_path / "var" / "cache" / "salt" / "master" / "extmods" + ) + assert opts["token_dir"] == str( + root_path / "var" / "cache" / "salt" / "master" / "tokens" + ) + assert opts["syndic_dir"] == str( + root_path / "var" / "cache" / "salt" / "master" / "syndics" + ) + assert opts["sqlite_queue_dir"] == str( + root_path / "var" / "cache" / "salt" / "master" / "queues" + ) + assert opts["log_file"] == str(root_path / "var" / "log" / "salt" / "master") + assert opts["key_logfile"] == str(root_path / "var" / "log" / "salt" / "key") + assert opts["ssh_log_file"] == str(root_path / "var" / "log" / "salt" / "ssh") + + # These are not tested because we didn't define them in the master config. + # assert opts["autosign_file"] == str(root_path / "var" / "run" / "salt"/ "master") + # assert opts["autoreject_file"] == str(root_path / "var" / "run" / "salt"/ "master") + # assert opts["autosign_grains_dir"] == str(root_path / "var" / "run" / "salt"/ "master") + + +def test_minion_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + minion_config = config_path / "minion" + minion_config.write_text(f"root_dir: {root_path}") + opts = salt.config.minion_config(minion_config) + if salt.utils.platform.is_windows(): + assert opts["pki_dir"] == str(root_path / "conf" / "pki" / "minion") + else: + assert opts["pki_dir"] == str(root_path / "etc" / "salt" / "pki" / "minion") + assert opts["cachedir"] == str(root_path / "var" / "cache" / "salt" / "minion") + assert opts["pidfile"] == str(root_path / "var" / "run" / "salt-minion.pid") + assert opts["sock_dir"] == str(root_path / "var" / "run" / "salt" / "minion") + assert opts["extension_modules"] == str( + root_path / "var" / "cache" / "salt" / "minion" / "extmods" + ) + assert opts["log_file"] == str(root_path / "var" / "log" / "salt" / "minion") + + +def test_api_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + master_config = config_path / "master" + master_config.write_text(f"root_dir: {root_path}") + opts = salt.config.api_config(master_config) + assert opts["pidfile"] == str(root_path / "var" / "run" / "salt-api.pid") + assert opts["log_file"] == str(root_path / "var" / "log" / "salt" / "api") + assert opts["api_pidfile"] == str(root_path / "var" / "run" / "salt-api.pid") + assert opts["api_logfile"] == str(root_path / "var" / "log" / "salt" / "api") + + +def test_spm_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + spm_config = config_path / "spm" + spm_config.write_text(f"root_dir: {root_path}") + opts = salt.config.spm_config(spm_config) + + assert opts["formula_path"] == str(root_path / "srv" / "spm" / "salt") + assert opts["pillar_path"] == str(root_path / "srv" / "spm" / "pillar") + assert opts["reactor_path"] == str(root_path / "srv" / "spm" / "reactor") + assert opts["spm_cache_dir"] == str(root_path / "var" / "cache" / "salt" / "spm") + assert opts["spm_build_dir"] == str(root_path / "srv" / "spm_build") + assert opts["spm_logfile"] == str(root_path / "var" / "log" / "salt" / "spm") + + +def test_syndic_config_relative_to_root_dir(tmp_path): + root_path = tmp_path + config_path = tmp_path / "conf" + config_path.mkdir() + master_config = config_path / "master" + master_config.write_text(f"root_dir: {root_path}") + minion_config = config_path / "master" + minion_config.write_text(f"root_dir: {root_path}") + opts = salt.config.syndic_config(master_config, minion_config) + if salt.utils.platform.is_windows(): + assert opts["pki_dir"] == str(root_path / "conf" / "pki" / "minion") + else: + assert opts["pki_dir"] == str(root_path / "etc" / "salt" / "pki" / "minion") + assert opts["cachedir"] == str(root_path / "var" / "cache" / "salt" / "master") + assert opts["pidfile"] == str(root_path / "var" / "run" / "salt-syndic.pid") + assert opts["sock_dir"] == str(root_path / "var" / "run" / "salt" / "minion") + assert opts["extension_modules"] == str( + root_path / "var" / "cache" / "salt" / "minion" / "extmods" + ) + assert opts["token_dir"] == str( + root_path / "var" / "cache" / "salt" / "master" / "tokens" + ) + assert opts["log_file"] == str(root_path / "var" / "log" / "salt" / "syndic") + assert opts["key_logfile"] == str(root_path / "var" / "log" / "salt" / "key") + assert opts["syndic_log_file"] == str(root_path / "var" / "log" / "salt" / "syndic") diff --git a/tests/pytests/integration/daemons/test_memory_leak.py b/tests/pytests/integration/daemons/test_memory_leak.py index 908f1f1e4f2..8461edeb558 100644 --- a/tests/pytests/integration/daemons/test_memory_leak.py +++ b/tests/pytests/integration/daemons/test_memory_leak.py @@ -48,7 +48,9 @@ def file_add_delete_sls(tmp_path, salt_master): yield sls_name -@pytest.mark.flaky(max_runs=4) +# This test is fundimentally flawed. Needs to be re-factored to test the memory +# consuption of the minoin process not system wide memory. +@pytest.mark.skip(reason="Flawed test") def test_memory_leak(salt_cli, salt_minion, file_add_delete_sls): max_usg = None diff --git a/tests/pytests/unit/test_config.py b/tests/pytests/unit/test_config.py index 7437c8214ed..313c3cb0b0e 100644 --- a/tests/pytests/unit/test_config.py +++ b/tests/pytests/unit/test_config.py @@ -5,7 +5,10 @@ tests.pytests.unit.test_config Unit tests for salt's config modulet """ +import pathlib + import salt.config +import salt.syspaths def test_call_id_function(tmp_path): @@ -21,3 +24,13 @@ def test_call_id_function(tmp_path): } ret = salt.config.call_id_function(opts) assert ret == "meh" + + +def test_prepend_root_dir(tmp_path): + root = tmp_path / "root" + opts = { + "root_dir": root, + "foo": str(pathlib.Path(salt.syspaths.ROOT_DIR) / "var" / "foo"), + } + salt.config.prepend_root_dir(opts, ["foo"]) + assert opts["foo"] == str(root / "var" / "foo")