mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Merge pull request #66018 from s0undt3ch/hotfix/merge-forward-into-3007.x
[3007.x] Merge 3006.x into 3007.x
This commit is contained in:
commit
acd688cc04
189 changed files with 3109 additions and 1141 deletions
2
.github/workflows/backport.yml
vendored
2
.github/workflows/backport.yml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
|||
)
|
||||
steps:
|
||||
- name: Backport Action
|
||||
uses: sqren/backport-github-action@v8.9.7
|
||||
uses: sorenlouv/backport-github-action@v8.9.7
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
auto_backport_label_prefix: "backport:"
|
||||
|
|
8
.github/workflows/ci.yml
vendored
8
.github/workflows/ci.yml
vendored
|
@ -448,7 +448,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
|
@ -464,7 +464,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-pkgs-onedir:
|
||||
|
@ -477,7 +477,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "onedir"
|
||||
|
||||
|
@ -491,7 +491,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "src"
|
||||
build-ci-deps:
|
||||
|
|
8
.github/workflows/nightly.yml
vendored
8
.github/workflows/nightly.yml
vendored
|
@ -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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
|
@ -516,7 +516,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-pkgs-onedir:
|
||||
|
@ -529,7 +529,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "onedir"
|
||||
environment: nightly
|
||||
|
@ -547,7 +547,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "src"
|
||||
environment: nightly
|
||||
|
|
8
.github/workflows/scheduled.yml
vendored
8
.github/workflows/scheduled.yml
vendored
|
@ -490,7 +490,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
|
@ -506,7 +506,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-pkgs-onedir:
|
||||
|
@ -519,7 +519,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "onedir"
|
||||
|
||||
|
@ -533,7 +533,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "src"
|
||||
build-ci-deps:
|
||||
|
|
8
.github/workflows/staging.yml
vendored
8
.github/workflows/staging.yml
vendored
|
@ -487,7 +487,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-salt-onedir:
|
||||
|
@ -503,7 +503,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.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
|
||||
build-pkgs-onedir:
|
||||
|
@ -516,7 +516,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "onedir"
|
||||
environment: staging
|
||||
|
@ -534,7 +534,7 @@ jobs:
|
|||
with:
|
||||
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
|
||||
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
|
||||
relenv-version: "0.14.2"
|
||||
relenv-version: "0.15.1"
|
||||
python-version: "3.10.13"
|
||||
source: "src"
|
||||
environment: staging
|
||||
|
|
|
@ -45,7 +45,7 @@ repos:
|
|||
salt/ext/.*
|
||||
)$
|
||||
|
||||
- repo: https://github.com/s0undt3ch/python-tools-scripts
|
||||
- repo: https://github.com/saltstack/python-tools-scripts
|
||||
rev: "0.18.6"
|
||||
hooks:
|
||||
- id: tools
|
||||
|
@ -1416,7 +1416,7 @@ repos:
|
|||
hooks:
|
||||
- id: remove-import-headers
|
||||
|
||||
- repo: https://github.com/s0undt3ch/salt-rewrite
|
||||
- repo: https://github.com/saltstack/salt-rewrite
|
||||
# Automatically rewrite code with known rules
|
||||
rev: 2.5.2
|
||||
hooks:
|
||||
|
|
55
CHANGELOG.md
55
CHANGELOG.md
|
@ -179,6 +179,61 @@ Versions are `MAJOR.PATCH`.
|
|||
- Update to `gitpython>=3.1.35` due to https://github.com/advisories/GHSA-wfm5-v35h-vwf4 and https://github.com/advisories/GHSA-cwvm-v4w8-q58c [#65137](https://github.com/saltstack/salt/issues/65137)
|
||||
|
||||
|
||||
## 3006.7 (2024-02-20)
|
||||
|
||||
|
||||
### Deprecated
|
||||
|
||||
- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
|
||||
|
||||
|
||||
### Changed
|
||||
|
||||
- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
|
||||
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix an issue with mac_shadow that was causing a command execution error when
|
||||
retrieving values that were not yet set. For example, retrieving last login
|
||||
before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
|
||||
- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
|
||||
- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
|
||||
- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
|
||||
- Fix an issue where the minion would crash on Windows if some of the grains
|
||||
failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
|
||||
- Fix issue with openscap when the error was outside the expected scope. It now
|
||||
returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
|
||||
- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
|
||||
- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
|
||||
- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
|
||||
- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
|
||||
- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
|
||||
- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
|
||||
- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
|
||||
- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
|
||||
- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
|
||||
- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
|
||||
- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
|
||||
- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
|
||||
- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
|
||||
- Fixed an issue where fileclient requests during Pillar rendering cause
|
||||
fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
|
||||
- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
|
||||
- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
|
||||
- Fix request channel default timeout regression. In 3006.5 it was changed from
|
||||
60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
|
||||
- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
|
||||
|
||||
|
||||
### Security
|
||||
|
||||
- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
|
||||
|
||||
In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
|
||||
- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
|
||||
|
||||
|
||||
## 3006.6 (2024-01-26)
|
||||
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@ version of Python:
|
|||
|
||||
::
|
||||
|
||||
pyenv install 3.7.0
|
||||
pyenv install 3.9.18
|
||||
|
||||
If that fails, don't panic! You're probably just missing some build
|
||||
dependencies. Check out `pyenv common build
|
||||
|
@ -99,7 +99,7 @@ new virtual environment with this command:
|
|||
|
||||
::
|
||||
|
||||
pyenv virtualenv 3.7.0 salt
|
||||
pyenv virtualenv 3.9.18 salt
|
||||
|
||||
Then activate it:
|
||||
|
||||
|
@ -321,8 +321,8 @@ documentation:
|
|||
|
||||
::
|
||||
|
||||
pyenv install 3.7.15
|
||||
pyenv virtualenv 3.7.15 salt-docs
|
||||
pyenv install 3.9.18
|
||||
pyenv virtualenv 3.9.18 salt-docs
|
||||
echo 'salt-docs' > .python-version
|
||||
|
||||
#. Activate `pyenv` if it's not auto-activated:
|
||||
|
@ -477,7 +477,7 @@ meaningful and complete! *Typically* the best tests for Salt are going
|
|||
to be unit tests. Testing is `a whole topic on its
|
||||
own <https://docs.saltproject.io/en/master/topics/tutorials/writing_tests.html>`__,
|
||||
But you may also want to write functional or integration tests. You'll
|
||||
find those in the ``salt/tests`` directory.
|
||||
find those in the ``tests/`` directory.
|
||||
|
||||
When you're thinking about tests to write, the most important thing to
|
||||
keep in mind is, “What, exactly, am I testing?” When a test fails, you
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Fixed an issue when keys didn't match because of line endings
|
|
@ -1 +0,0 @@
|
|||
Corrected encoding of credentials for use with Artifactory
|
|
@ -1 +0,0 @@
|
|||
Use `send_multipart` instead of `send` when sending multipart message.
|
|
@ -1,2 +0,0 @@
|
|||
Fix issue with openscap when the error was outside the expected scope. It now
|
||||
returns failed with the error code and the error
|
|
@ -1 +0,0 @@
|
|||
Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration
|
|
@ -1 +0,0 @@
|
|||
Fix boto execution module loading
|
|
@ -1 +0,0 @@
|
|||
Removed PR 65185 changes since incomplete solution
|
|
@ -1 +0,0 @@
|
|||
Fix nonsensical time in fileclient timeout error.
|
|
@ -1 +0,0 @@
|
|||
Fixes an issue when reading/modifying ini files that contain unicode characters
|
|
@ -1 +0,0 @@
|
|||
added https proxy to the list of proxies so that requests knows what to do with https based proxies
|
|
@ -1 +0,0 @@
|
|||
Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008.
|
|
@ -1 +0,0 @@
|
|||
Deprecate and stop using ``salt.features``
|
|
@ -1,6 +1,6 @@
|
|||
nox_version: "2022.8.7"
|
||||
python_version: "3.10.13"
|
||||
relenv_version: "0.14.2"
|
||||
relenv_version: "0.15.1"
|
||||
release_branches:
|
||||
- "3006.x"
|
||||
- "3007.x"
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-API" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-API" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-api \- salt-api Command
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-CALL" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-CALL" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-call \- salt-call Documentation
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-CLOUD" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-CLOUD" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-cloud \- Salt Cloud Command
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-CP" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-CP" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-cp \- salt-cp Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-KEY" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-KEY" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-key \- salt-key Documentation
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-MASTER" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-MASTER" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-master \- salt-master Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-MINION" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-MINION" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-minion \- salt-minion Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-PROXY" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-PROXY" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-proxy \- salt-proxy Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-RUN" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-RUN" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-run \- salt-run Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-SSH" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-SSH" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-ssh \- salt-ssh Documentation
|
||||
.SH SYNOPSIS
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT-SYNDIC" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT-SYNDIC" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt-syndic \- salt-syndic Documentation
|
||||
.sp
|
||||
|
|
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SALT" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SALT" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
salt \- salt
|
||||
.SH SYNOPSIS
|
||||
|
|
643
doc/man/salt.7
643
doc/man/salt.7
File diff suppressed because it is too large
Load diff
|
@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
|||
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
|
||||
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
|
||||
..
|
||||
.TH "SPM" "1" "Generated on January 26, 2024 at 11:57:28 AM UTC." "3006.6" "Salt"
|
||||
.TH "SPM" "1" "Generated on February 20, 2024 at 09:55:17 PM UTC." "3006.7" "Salt"
|
||||
.SH NAME
|
||||
spm \- Salt Package Manager Command
|
||||
.sp
|
||||
|
|
70
doc/topics/releases/3006.7.md
Normal file
70
doc/topics/releases/3006.7.md
Normal file
|
@ -0,0 +1,70 @@
|
|||
(release-3006.7)=
|
||||
# Salt 3006.7 release notes
|
||||
|
||||
<!---
|
||||
Do not edit this file. This is auto generated.
|
||||
Edit the templates in doc/topics/releases/templates/
|
||||
for a given release.
|
||||
-->
|
||||
|
||||
|
||||
<!--
|
||||
Add release specific details below
|
||||
-->
|
||||
|
||||
<!--
|
||||
Do not edit the changelog below.
|
||||
This is auto generated.
|
||||
-->
|
||||
## Changelog
|
||||
|
||||
### Deprecated
|
||||
|
||||
- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
|
||||
|
||||
|
||||
### Changed
|
||||
|
||||
- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
|
||||
|
||||
|
||||
### Fixed
|
||||
|
||||
- Fix an issue with mac_shadow that was causing a command execution error when
|
||||
retrieving values that were not yet set. For example, retrieving last login
|
||||
before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
|
||||
- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
|
||||
- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
|
||||
- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
|
||||
- Fix an issue where the minion would crash on Windows if some of the grains
|
||||
failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
|
||||
- Fix issue with openscap when the error was outside the expected scope. It now
|
||||
returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
|
||||
- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
|
||||
- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
|
||||
- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
|
||||
- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
|
||||
- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
|
||||
- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
|
||||
- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
|
||||
- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
|
||||
- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
|
||||
- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
|
||||
- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
|
||||
- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
|
||||
- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
|
||||
- Fixed an issue where fileclient requests during Pillar rendering cause
|
||||
fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
|
||||
- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
|
||||
- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
|
||||
- Fix request channel default timeout regression. In 3006.5 it was changed from
|
||||
60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
|
||||
- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
|
||||
|
||||
|
||||
### Security
|
||||
|
||||
- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
|
||||
|
||||
In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
|
||||
- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
|
14
doc/topics/releases/templates/3006.7.md.template
Normal file
14
doc/topics/releases/templates/3006.7.md.template
Normal file
|
@ -0,0 +1,14 @@
|
|||
(release-3006.7)=
|
||||
# Salt 3006.7 release notes{{ unreleased }}
|
||||
{{ warning }}
|
||||
|
||||
<!--
|
||||
Add release specific details below
|
||||
-->
|
||||
|
||||
<!--
|
||||
Do not edit the changelog below.
|
||||
This is auto generated.
|
||||
-->
|
||||
## Changelog
|
||||
{{ changelog }}
|
|
@ -1,3 +1,57 @@
|
|||
salt (3006.7) stable; urgency=medium
|
||||
|
||||
|
||||
# Deprecated
|
||||
|
||||
* Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
|
||||
|
||||
# Changed
|
||||
|
||||
* Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
|
||||
|
||||
# Fixed
|
||||
|
||||
* Fix an issue with mac_shadow that was causing a command execution error when
|
||||
retrieving values that were not yet set. For example, retrieving last login
|
||||
before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
|
||||
* Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
|
||||
* Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
|
||||
* Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
|
||||
* Fix an issue where the minion would crash on Windows if some of the grains
|
||||
failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
|
||||
* Fix issue with openscap when the error was outside the expected scope. It now
|
||||
returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
|
||||
* Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
|
||||
* Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
|
||||
* Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
|
||||
* Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
|
||||
* Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
|
||||
* Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
|
||||
* catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
|
||||
* Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
|
||||
* Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
|
||||
* added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
|
||||
* Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
|
||||
* Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
|
||||
* Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
|
||||
* Fixed an issue where fileclient requests during Pillar rendering cause
|
||||
fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
|
||||
* Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
|
||||
* Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
|
||||
* Fix request channel default timeout regression. In 3006.5 it was changed from
|
||||
60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
|
||||
* Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
|
||||
|
||||
# Security
|
||||
|
||||
* Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
|
||||
|
||||
In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
|
||||
* Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
|
||||
|
||||
|
||||
-- Salt Project Packaging <saltproject-packaging@vmware.com> Tue, 20 Feb 2024 21:54:35 +0000
|
||||
|
||||
salt (3006.6) stable; urgency=medium
|
||||
|
||||
|
||||
|
|
|
@ -432,17 +432,33 @@ find /etc/salt /opt/saltstack/salt /var/log/salt /var/cache/salt /var/run/salt \
|
|||
|
||||
|
||||
# assumes systemd for RHEL 7 & 8 & 9
|
||||
# foregoing %systemd_* scriptlets due to RHEL 7/8 vs. RHEL 9 incompatibilities
|
||||
## - Using hardcoded scriptlet definitions from RHEL 7/8 that are forward-compatible
|
||||
%preun master
|
||||
# RHEL 9 is giving warning msg if syndic is not installed, supress it
|
||||
%systemd_preun salt-syndic.service > /dev/null 2>&1
|
||||
|
||||
# %%systemd_preun salt-syndic.service > /dev/null 2>&1
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
systemctl --no-reload disable salt-syndic.service > /dev/null 2>&1 || :
|
||||
systemctl stop salt-syndic.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun minion
|
||||
%systemd_preun salt-minion.service
|
||||
# %%systemd_preun salt-minion.service
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
systemctl --no-reload disable salt-minion.service > /dev/null 2>&1 || :
|
||||
systemctl stop salt-minion.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
|
||||
%preun api
|
||||
%systemd_preun salt-api.service
|
||||
# %%systemd_preun salt-api.service
|
||||
if [ $1 -eq 0 ] ; then
|
||||
# Package removal, not upgrade
|
||||
systemctl --no-reload disable salt-api.service > /dev/null 2>&1 || :
|
||||
systemctl stop salt-api.service > /dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
|
||||
%post
|
||||
|
@ -456,7 +472,14 @@ ln -s -f /opt/saltstack/salt/salt-cloud %{_bindir}/salt-cloud
|
|||
|
||||
|
||||
%post master
|
||||
%systemd_post salt-master.service
|
||||
# %%systemd_post salt-master.service
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl retry-restart salt-master.service >/dev/null 2>&1 || :
|
||||
else
|
||||
# Initial installation
|
||||
systemctl preset salt-master.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
ln -s -f /opt/saltstack/salt/salt %{_bindir}/salt
|
||||
ln -s -f /opt/saltstack/salt/salt-cp %{_bindir}/salt-cp
|
||||
ln -s -f /opt/saltstack/salt/salt-key %{_bindir}/salt-key
|
||||
|
@ -477,11 +500,25 @@ if [ $1 -lt 2 ]; then
|
|||
fi
|
||||
|
||||
%post syndic
|
||||
%systemd_post salt-syndic.service
|
||||
# %%systemd_post salt-syndic.service
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl retry-restart salt-syndic.service >/dev/null 2>&1 || :
|
||||
else
|
||||
# Initial installation
|
||||
systemctl preset salt-syndic.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
ln -s -f /opt/saltstack/salt/salt-syndic %{_bindir}/salt-syndic
|
||||
|
||||
%post minion
|
||||
%systemd_post salt-minion.service
|
||||
# %%systemd_post salt-minion.service
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl retry-restart salt-minion.service >/dev/null 2>&1 || :
|
||||
else
|
||||
# Initial installation
|
||||
systemctl preset salt-minion.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
ln -s -f /opt/saltstack/salt/salt-minion %{_bindir}/salt-minion
|
||||
ln -s -f /opt/saltstack/salt/salt-call %{_bindir}/salt-call
|
||||
ln -s -f /opt/saltstack/salt/salt-proxy %{_bindir}/salt-proxy
|
||||
|
@ -503,7 +540,14 @@ fi
|
|||
ln -s -f /opt/saltstack/salt/salt-ssh %{_bindir}/salt-ssh
|
||||
|
||||
%post api
|
||||
%systemd_post salt-api.service
|
||||
# %%systemd_post salt-api.service
|
||||
if [ $1 -gt 1 ] ; then
|
||||
# Upgrade
|
||||
systemctl retry-restart salt-api.service >/dev/null 2>&1 || :
|
||||
else
|
||||
# Initial installation
|
||||
systemctl preset salt-api.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
ln -s -f /opt/saltstack/salt/salt-api %{_bindir}/salt-api
|
||||
|
||||
|
||||
|
@ -544,7 +588,12 @@ if [ $1 -eq 0 ]; then
|
|||
fi
|
||||
|
||||
%postun master
|
||||
%systemd_postun_with_restart salt-master.service
|
||||
# %%systemd_postun_with_restart salt-master.service
|
||||
systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
systemctl try-restart salt-master.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed 's/\"//g' | cut -d '.' -f 1) = "8" ]; then
|
||||
if [ -z "$(rpm -qi salt-minion | grep Name | grep salt-minion)" ]; then
|
||||
|
@ -560,10 +609,20 @@ if [ $1 -eq 0 ]; then
|
|||
fi
|
||||
|
||||
%postun syndic
|
||||
%systemd_postun_with_restart salt-syndic.service
|
||||
# %%systemd_postun_with_restart salt-syndic.service
|
||||
systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
systemctl try-restart salt-syndic.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun minion
|
||||
%systemd_postun_with_restart salt-minion.service
|
||||
# %%systemd_postun_with_restart salt-minion.service
|
||||
systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
systemctl try-restart salt-minion.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ $(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2 | sed 's/\"//g' | cut -d '.' -f 1) = "8" ]; then
|
||||
if [ -z "$(rpm -qi salt-master | grep Name | grep salt-master)" ]; then
|
||||
|
@ -579,10 +638,65 @@ if [ $1 -eq 0 ]; then
|
|||
fi
|
||||
|
||||
%postun api
|
||||
%systemd_postun_with_restart salt-api.service
|
||||
|
||||
# %%systemd_postun_with_restart salt-api.service
|
||||
systemctl daemon-reload >/dev/null 2>&1 || :
|
||||
if [ $1 -ge 1 ] ; then
|
||||
# Package upgrade, not uninstall
|
||||
systemctl try-restart salt-api.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%changelog
|
||||
* Tue Feb 20 2024 Salt Project Packaging <saltproject-packaging@vmware.com> - 3006.7
|
||||
|
||||
# Deprecated
|
||||
|
||||
- Deprecate and stop using ``salt.features`` [#65951](https://github.com/saltstack/salt/issues/65951)
|
||||
|
||||
# Changed
|
||||
|
||||
- Change module search path priority, so Salt extensions can be overridden by syncable modules and module_dirs. You can switch back to the old logic by setting features.enable_deprecated_module_search_path_priority to true, but it will be removed in Salt 3008. [#65938](https://github.com/saltstack/salt/issues/65938)
|
||||
|
||||
# Fixed
|
||||
|
||||
- Fix an issue with mac_shadow that was causing a command execution error when
|
||||
retrieving values that were not yet set. For example, retrieving last login
|
||||
before the user had logged in. [#34658](https://github.com/saltstack/salt/issues/34658)
|
||||
- Fixed an issue when keys didn't match because of line endings [#52289](https://github.com/saltstack/salt/issues/52289)
|
||||
- Corrected encoding of credentials for use with Artifactory [#63063](https://github.com/saltstack/salt/issues/63063)
|
||||
- Use `send_multipart` instead of `send` when sending multipart message. [#65018](https://github.com/saltstack/salt/issues/65018)
|
||||
- Fix an issue where the minion would crash on Windows if some of the grains
|
||||
failed to resolve [#65154](https://github.com/saltstack/salt/issues/65154)
|
||||
- Fix issue with openscap when the error was outside the expected scope. It now
|
||||
returns failed with the error code and the error [#65193](https://github.com/saltstack/salt/issues/65193)
|
||||
- Upgrade relenv to 0.15.0 to fix namespaced packages installed by salt-pip [#65433](https://github.com/saltstack/salt/issues/65433)
|
||||
- Fix regression of fileclient re-use when rendering sls pillars and states [#65450](https://github.com/saltstack/salt/issues/65450)
|
||||
- Fixes the s3fs backend computing the local cache's files with the wrong hash type [#65589](https://github.com/saltstack/salt/issues/65589)
|
||||
- Fixed Salt-SSH pillar rendering and state rendering with nested SSH calls when called via saltutil.cmd or in an orchestration [#65670](https://github.com/saltstack/salt/issues/65670)
|
||||
- Fix boto execution module loading [#65691](https://github.com/saltstack/salt/issues/65691)
|
||||
- Removed PR 65185 changes since incomplete solution [#65692](https://github.com/saltstack/salt/issues/65692)
|
||||
- catch only ret/ events not all returning events. [#65727](https://github.com/saltstack/salt/issues/65727)
|
||||
- Fix nonsensical time in fileclient timeout error. [#65752](https://github.com/saltstack/salt/issues/65752)
|
||||
- Fixes an issue when reading/modifying ini files that contain unicode characters [#65777](https://github.com/saltstack/salt/issues/65777)
|
||||
- added https proxy to the list of proxies so that requests knows what to do with https based proxies [#65824](https://github.com/saltstack/salt/issues/65824)
|
||||
- Ensure minion channels are closed on any master connection error. [#65932](https://github.com/saltstack/salt/issues/65932)
|
||||
- Fixed issue where Salt can't find libcrypto when pip installed from a cloned repo [#65954](https://github.com/saltstack/salt/issues/65954)
|
||||
- Fix RPM package systemd scriptlets to make RPM packages more universal [#65987](https://github.com/saltstack/salt/issues/65987)
|
||||
- Fixed an issue where fileclient requests during Pillar rendering cause
|
||||
fileserver backends to be needlessly refreshed. [#65990](https://github.com/saltstack/salt/issues/65990)
|
||||
- Fix exceptions being set on futures that are already done in ZeroMQ transport [#66006](https://github.com/saltstack/salt/issues/66006)
|
||||
- Use hmac compare_digest method in hashutil module to mitigate potential timing attacks [#66041](https://github.com/saltstack/salt/issues/66041)
|
||||
- Fix request channel default timeout regression. In 3006.5 it was changed from
|
||||
60 to 30 and is now set back to 60 by default. [#66061](https://github.com/saltstack/salt/issues/66061)
|
||||
- Upgrade relenv to 0.15.1 to fix debugpy support. [#66094](https://github.com/saltstack/salt/issues/66094)
|
||||
|
||||
# Security
|
||||
|
||||
- Bump to ``cryptography==42.0.0`` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
|
||||
|
||||
In the process, we were also required to update to ``pyOpenSSL==24.0.0`` [#66004](https://github.com/saltstack/salt/issues/66004)
|
||||
- Bump to `cryptography==42.0.3` due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f [#66090](https://github.com/saltstack/salt/issues/66090)
|
||||
|
||||
|
||||
* Fri Jan 26 2024 Salt Project Packaging <saltproject-packaging@vmware.com> - 3006.6
|
||||
|
||||
# Changed
|
||||
|
|
|
@ -19,12 +19,12 @@ contextvars
|
|||
|
||||
setproctitle>=1.2.3
|
||||
timelib>=0.2.5
|
||||
pyopenssl>=20.0.1
|
||||
pyopenssl>=24.0.0
|
||||
python-dateutil>=2.8.1
|
||||
python-gnupg>=0.4.7
|
||||
cherrypy>=18.6.1
|
||||
importlib-metadata>=3.3.0
|
||||
cryptography>=41.0.3
|
||||
cryptography>=42.0.0
|
||||
|
||||
# From old requirements/static/pkg/linux.in
|
||||
rpm-vercmp; sys_platform == 'linux'
|
||||
|
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
@ -23,7 +23,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# aiohttp
|
||||
|
@ -97,7 +97,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -164,7 +164,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# jaraco.text
|
||||
|
@ -340,7 +340,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -399,11 +399,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# tempora
|
||||
|
@ -422,7 +422,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -519,6 +519,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -36,7 +36,7 @@ idna==3.4
|
|||
# requests
|
||||
imagesize==1.4.1
|
||||
# via sphinx
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -103,7 +103,7 @@ pyenchant==3.2.2
|
|||
# via sphinxcontrib-spelling
|
||||
pygments==2.15.1
|
||||
# via sphinx
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# tempora
|
||||
|
@ -149,6 +149,7 @@ tempora==5.3.0
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.10/linux.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
uc-micro-py==1.0.2
|
||||
# via linkify-it-py
|
||||
|
|
|
@ -23,7 +23,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# aiohttp
|
||||
|
@ -96,7 +96,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -163,7 +163,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# jaraco.text
|
||||
|
@ -344,7 +344,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -403,11 +403,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# tempora
|
||||
|
@ -426,7 +426,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -524,6 +524,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -17,7 +17,7 @@ aiosignal==1.3.1
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# aiohttp
|
||||
ansible-core==2.16.2
|
||||
ansible-core==2.16.3
|
||||
# via ansible
|
||||
ansible==9.1.0 ; python_version >= "3.10"
|
||||
# via -r requirements/static/ci/linux.in
|
||||
|
@ -33,7 +33,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# aiohttp
|
||||
|
@ -109,7 +109,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -187,7 +187,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -378,7 +378,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -439,13 +439,13 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-telegram-bot==20.3
|
||||
# via -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# tempora
|
||||
|
@ -466,7 +466,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -588,6 +588,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/linux.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.10/tools.txt requirements/static/ci/tools.in
|
||||
#
|
||||
attrs==20.3.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -r requirements/static/ci/tools.in
|
||||
# python-tools-scripts
|
||||
|
|
|
@ -17,7 +17,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# aiohttp
|
||||
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -156,7 +156,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# jaraco.text
|
||||
|
@ -301,7 +301,7 @@ pymysql==1.1.0 ; sys_platform == "win32"
|
|||
# -r requirements/base.txt
|
||||
pynacl==1.5.0
|
||||
# via -r requirements/static/ci/common.in
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -354,15 +354,15 @@ python-dateutil==2.8.2
|
|||
# moto
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# tempora
|
||||
|
@ -386,7 +386,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamllint
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -464,6 +464,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.10/windows.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
# pytest-system-statistics
|
||||
|
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
@ -23,12 +23,11 @@ asn1crypto==1.5.1
|
|||
# via
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -97,7 +96,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -342,7 +341,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -379,7 +378,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -401,11 +400,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# tempora
|
||||
|
@ -424,7 +423,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -111,7 +111,7 @@ pyenchant==3.2.2
|
|||
# via sphinxcontrib-spelling
|
||||
pygments==2.15.1
|
||||
# via sphinx
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.11/linux.txt
|
||||
# tempora
|
||||
|
|
|
@ -23,12 +23,11 @@ asn1crypto==1.5.1
|
|||
# via
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -96,7 +95,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -346,7 +345,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -383,7 +382,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -405,11 +404,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# tempora
|
||||
|
@ -428,7 +427,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/freebsd.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -21,7 +21,7 @@ annotated-types==0.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# pydantic
|
||||
ansible-core==2.16.2
|
||||
ansible-core==2.16.3
|
||||
# via ansible
|
||||
ansible==9.1.0 ; python_version >= "3.10"
|
||||
# via -r requirements/static/ci/linux.in
|
||||
|
@ -33,12 +33,11 @@ asn1crypto==1.5.1
|
|||
# via
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -109,7 +108,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -378,7 +377,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -415,7 +414,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -439,13 +438,13 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-telegram-bot==20.3
|
||||
# via -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# tempora
|
||||
|
@ -466,7 +465,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/tools.txt requirements/static/ci/tools.in
|
||||
#
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -r requirements/static/ci/tools.in
|
||||
# python-tools-scripts
|
||||
|
|
|
@ -17,12 +17,11 @@ annotated-types==0.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -93,7 +92,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -303,7 +302,7 @@ pymysql==1.1.0 ; sys_platform == "win32"
|
|||
# -r requirements/base.txt
|
||||
pynacl==1.5.0
|
||||
# via -r requirements/static/ci/common.in
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -336,7 +335,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==2.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -356,21 +355,21 @@ python-dateutil==2.8.2
|
|||
# moto
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# tempora
|
||||
pyvmomi==8.0.1.0.1
|
||||
# via -r requirements/static/ci/common.in
|
||||
pywin32==305 ; sys_platform == "win32"
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -388,7 +387,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamllint
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.11/windows.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -30,13 +30,12 @@ asn1crypto==1.5.1
|
|||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -130,7 +129,7 @@ croniter==1.3.15 ; sys_platform != "win32"
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -482,7 +481,7 @@ pynacl==1.5.0
|
|||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -548,7 +547,7 @@ pytest-timeout==1.4.2
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/pytest.txt
|
||||
|
@ -574,12 +573,12 @@ python-etcd==0.4.5
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -603,7 +602,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
|
|
@ -28,7 +28,6 @@ attrs==23.2.0
|
|||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -97,7 +96,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -342,7 +341,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -379,7 +378,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -401,11 +400,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# tempora
|
||||
|
@ -424,7 +423,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -18,7 +18,7 @@ annotated-types==0.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# aiohttp
|
||||
|
@ -53,7 +53,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -187,7 +187,7 @@ pyenchant==3.2.2
|
|||
# via sphinxcontrib-spelling
|
||||
pygments==2.15.1
|
||||
# via sphinx
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -195,11 +195,11 @@ python-dateutil==2.8.2
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# tempora
|
||||
|
@ -208,7 +208,7 @@ pyyaml==6.0.1
|
|||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
# myst-docutils
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -23,12 +23,11 @@ asn1crypto==1.5.1
|
|||
# via
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -96,7 +95,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -346,7 +345,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -383,7 +382,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -405,11 +404,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# tempora
|
||||
|
@ -428,7 +427,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/freebsd.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -26,7 +26,7 @@ annotated-types==0.6.0
|
|||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# pydantic
|
||||
ansible-core==2.16.2
|
||||
ansible-core==2.16.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# ansible
|
||||
|
@ -49,7 +49,7 @@ asn1crypto==1.5.1
|
|||
# oscrypto
|
||||
astroid==2.3.3
|
||||
# via pylint
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -147,7 +147,7 @@ croniter==1.3.15 ; sys_platform != "win32"
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -518,7 +518,7 @@ pynacl==1.5.0
|
|||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -555,7 +555,7 @@ python-etcd==0.4.5
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -564,7 +564,7 @@ python-telegram-bot==20.3
|
|||
# via
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
# -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
@ -588,7 +588,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -c requirements/static/ci/py3.12/linux.txt
|
||||
|
|
|
@ -21,7 +21,7 @@ annotated-types==0.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# pydantic
|
||||
ansible-core==2.16.2
|
||||
ansible-core==2.16.3
|
||||
# via ansible
|
||||
ansible==9.1.0 ; python_version >= "3.10"
|
||||
# via -r requirements/static/ci/linux.in
|
||||
|
@ -33,12 +33,11 @@ asn1crypto==1.5.1
|
|||
# via
|
||||
# certvalidator
|
||||
# oscrypto
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -109,7 +108,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -378,7 +377,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -415,7 +414,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==1.4.2
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -439,13 +438,13 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-telegram-bot==20.3
|
||||
# via -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# tempora
|
||||
|
@ -466,7 +465,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.12/tools.txt requirements/static/ci/tools.in
|
||||
#
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -r requirements/static/ci/tools.in
|
||||
# python-tools-scripts
|
||||
|
|
|
@ -17,12 +17,11 @@ annotated-types==0.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# aiohttp
|
||||
# jsonschema
|
||||
# pytest
|
||||
# pytest-salt-factories
|
||||
# pytest-shell-utilities
|
||||
# pytest-skip-markers
|
||||
|
@ -93,7 +92,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -303,7 +302,7 @@ pymysql==1.1.0 ; sys_platform == "win32"
|
|||
# -r requirements/base.txt
|
||||
pynacl==1.5.0
|
||||
# via -r requirements/static/ci/common.in
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -336,7 +335,7 @@ pytest-system-statistics==1.0.2
|
|||
# via pytest-salt-factories
|
||||
pytest-timeout==2.1.0
|
||||
# via -r requirements/pytest.txt
|
||||
pytest==7.2.0
|
||||
pytest==7.3.2
|
||||
# via
|
||||
# -r requirements/pytest.txt
|
||||
# pytest-custom-exit-code
|
||||
|
@ -356,7 +355,7 @@ python-dateutil==2.8.2
|
|||
# moto
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -364,7 +363,7 @@ pythonnet==3.0.3 ; sys_platform == "win32"
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# tempora
|
||||
|
@ -388,7 +387,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamllint
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.12/windows.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
@ -44,7 +44,7 @@ importlib-resources==5.12.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -111,7 +111,7 @@ pyenchant==3.2.2
|
|||
# via sphinxcontrib-spelling
|
||||
pygments==2.15.1
|
||||
# via sphinx
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# babel
|
||||
|
@ -158,6 +158,7 @@ tempora==5.3.0
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.8/linux.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
uc-micro-py==1.0.2
|
||||
# via linkify-it-py
|
||||
|
|
|
@ -23,7 +23,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# aiohttp
|
||||
|
@ -96,7 +96,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -167,7 +167,7 @@ importlib-resources==5.12.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# jaraco.text
|
||||
|
@ -348,7 +348,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -407,11 +407,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# tempora
|
||||
|
@ -430,7 +430,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -528,6 +528,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/freebsd.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -29,7 +29,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# aiohttp
|
||||
|
@ -105,7 +105,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -186,7 +186,7 @@ importlib-resources==5.12.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -375,7 +375,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -436,13 +436,13 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-telegram-bot==20.3
|
||||
# via -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# tempora
|
||||
|
@ -462,7 +462,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -580,6 +580,7 @@ twilio==8.2.2
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/linux.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -17,7 +17,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# aiohttp
|
||||
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -160,7 +160,7 @@ importlib-resources==5.12.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# jaraco.text
|
||||
|
@ -305,7 +305,7 @@ pymysql==1.1.0 ; sys_platform == "win32"
|
|||
# -r requirements/base.txt
|
||||
pynacl==1.5.0
|
||||
# via -r requirements/static/ci/common.in
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -358,15 +358,15 @@ python-dateutil==2.8.2
|
|||
# moto
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# tempora
|
||||
|
@ -391,7 +391,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamllint
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -469,6 +469,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.8/windows.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
# pytest-system-statistics
|
||||
|
|
|
@ -20,7 +20,7 @@ charset-normalizer==3.2.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# requests
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# pyspnego
|
||||
|
|
|
@ -23,7 +23,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# aiohttp
|
||||
|
@ -97,7 +97,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -164,7 +164,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# jaraco.text
|
||||
|
@ -340,7 +340,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -399,11 +399,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# tempora
|
||||
|
@ -422,7 +422,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -519,6 +519,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/darwin.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -40,7 +40,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# sphinx
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -107,7 +107,7 @@ pyenchant==3.2.2
|
|||
# via sphinxcontrib-spelling
|
||||
pygments==2.15.1
|
||||
# via sphinx
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# tempora
|
||||
|
@ -153,6 +153,7 @@ tempora==5.3.0
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/py3.9/linux.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
uc-micro-py==1.0.2
|
||||
# via linkify-it-py
|
||||
|
|
|
@ -23,7 +23,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# aiohttp
|
||||
|
@ -96,7 +96,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -163,7 +163,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# jaraco.text
|
||||
|
@ -344,7 +344,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -403,11 +403,11 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# tempora
|
||||
|
@ -426,7 +426,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -524,6 +524,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/freebsd.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -29,7 +29,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# aiohttp
|
||||
|
@ -105,7 +105,7 @@ contextvars==2.4
|
|||
# -r requirements/base.txt
|
||||
croniter==1.3.15 ; sys_platform != "win32"
|
||||
# via -r requirements/static/ci/common.in
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -182,7 +182,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# jaraco.text
|
||||
|
@ -371,7 +371,7 @@ pynacl==1.5.0
|
|||
# via
|
||||
# -r requirements/static/ci/common.in
|
||||
# paramiko
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -432,13 +432,13 @@ python-dateutil==2.8.2
|
|||
# vcert
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/base.txt
|
||||
python-telegram-bot==20.3
|
||||
# via -r requirements/static/ci/linux.in
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# tempora
|
||||
|
@ -458,7 +458,7 @@ pyyaml==6.0.1
|
|||
# responses
|
||||
# yamllint
|
||||
# yamlordereddictloader
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -576,6 +576,7 @@ twilio==8.2.2
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/linux.txt
|
||||
# inflect
|
||||
# napalm
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
# pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.9/tools.txt requirements/static/ci/tools.in
|
||||
#
|
||||
attrs==20.3.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -r requirements/static/ci/tools.in
|
||||
# python-tools-scripts
|
||||
|
|
|
@ -17,7 +17,7 @@ async-timeout==4.0.3
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# aiohttp
|
||||
|
@ -93,7 +93,7 @@ contextvars==2.4
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -156,7 +156,7 @@ importlib-metadata==6.6.0
|
|||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# jaraco.text
|
||||
|
@ -301,7 +301,7 @@ pymysql==1.1.0 ; sys_platform == "win32"
|
|||
# -r requirements/base.txt
|
||||
pynacl==1.5.0
|
||||
# via -r requirements/static/ci/common.in
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
|
@ -354,15 +354,15 @@ python-dateutil==2.8.2
|
|||
# moto
|
||||
python-etcd==0.4.5
|
||||
# via -r requirements/static/ci/common.in
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# tempora
|
||||
|
@ -387,7 +387,7 @@ pyyaml==6.0.1
|
|||
# pytest-salt-factories
|
||||
# responses
|
||||
# yamllint
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# -r requirements/zeromq.txt
|
||||
|
@ -465,6 +465,7 @@ types-pyyaml==6.0.1
|
|||
typing-extensions==4.8.0
|
||||
# via
|
||||
# -c requirements/static/ci/../pkg/py3.9/windows.txt
|
||||
# inflect
|
||||
# pydantic
|
||||
# pytest-shell-utilities
|
||||
# pytest-system-statistics
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -116,7 +116,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -116,7 +116,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -118,7 +118,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -30,7 +30,7 @@ clr-loader==0.2.6
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -48,7 +48,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -101,15 +101,15 @@ pymssql==2.2.7 ; sys_platform == "win32"
|
|||
# via -r requirements/base.txt
|
||||
pymysql==1.1.0 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
|
@ -117,7 +117,7 @@ pywin32==306 ; sys_platform == "win32"
|
|||
# wmi
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -132,7 +132,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
wmi==1.5.1 ; sys_platform == "win32"
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -30,7 +30,7 @@ clr-loader==0.2.6
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -103,23 +103,23 @@ pymssql==2.2.7 ; sys_platform == "win32"
|
|||
# via -r requirements/base.txt
|
||||
pymysql==1.1.0 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pywin32==305 ; sys_platform == "win32"
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# wmi
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -93,17 +93,17 @@ pydantic-core==2.14.5
|
|||
# via pydantic
|
||||
pydantic==2.5.2
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
annotated-types==0.6.0
|
||||
# via pydantic
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -30,7 +30,7 @@ clr-loader==0.2.6
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -103,15 +103,15 @@ pymssql==2.2.7 ; sys_platform == "win32"
|
|||
# via -r requirements/base.txt
|
||||
pymysql==1.1.0 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
|
@ -119,7 +119,7 @@ pywin32==306 ; sys_platform == "win32"
|
|||
# wmi
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -46,7 +46,7 @@ importlib-metadata==6.6.0
|
|||
# via -r requirements/base.txt
|
||||
importlib-resources==5.12.0
|
||||
# via jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -93,17 +93,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -118,7 +118,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -46,7 +46,7 @@ importlib-metadata==6.6.0
|
|||
# via -r requirements/base.txt
|
||||
importlib-resources==5.12.0
|
||||
# via jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -93,17 +93,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -120,7 +120,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -30,7 +30,7 @@ clr-loader==0.2.6
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -50,7 +50,7 @@ importlib-metadata==6.6.0
|
|||
# via -r requirements/base.txt
|
||||
importlib-resources==5.12.0
|
||||
# via jaraco.text
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -103,15 +103,15 @@ pymssql==2.2.7 ; sys_platform == "win32"
|
|||
# via -r requirements/base.txt
|
||||
pymysql==1.1.0 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
|
@ -120,7 +120,7 @@ pywin32==306 ; sys_platform == "win32"
|
|||
# wmi
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -135,7 +135,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
wmi==1.5.1 ; sys_platform == "win32"
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -116,7 +116,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -116,7 +116,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -26,7 +26,7 @@ cherrypy==18.8.0
|
|||
# via -r requirements/base.txt
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -44,7 +44,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -91,17 +91,17 @@ pycryptodomex==3.19.1
|
|||
# via -r requirements/crypto.txt
|
||||
pydantic==1.10.8
|
||||
# via inflect
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -118,7 +118,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
yarl==1.9.4
|
||||
|
|
|
@ -10,7 +10,7 @@ aiosignal==1.3.1
|
|||
# via aiohttp
|
||||
async-timeout==4.0.3
|
||||
# via aiohttp
|
||||
attrs==23.1.0
|
||||
attrs==23.2.0
|
||||
# via aiohttp
|
||||
autocommand==2.2.2
|
||||
# via jaraco.text
|
||||
|
@ -30,7 +30,7 @@ clr-loader==0.2.6
|
|||
# via pythonnet
|
||||
contextvars==2.4
|
||||
# via -r requirements/base.txt
|
||||
cryptography==41.0.7
|
||||
cryptography==42.0.3
|
||||
# via
|
||||
# -r requirements/base.txt
|
||||
# pyopenssl
|
||||
|
@ -48,7 +48,7 @@ immutables==0.15
|
|||
# via contextvars
|
||||
importlib-metadata==6.6.0
|
||||
# via -r requirements/base.txt
|
||||
inflect==6.0.4
|
||||
inflect==7.0.0
|
||||
# via jaraco.text
|
||||
jaraco.collections==4.1.0
|
||||
# via cherrypy
|
||||
|
@ -101,15 +101,15 @@ pymssql==2.2.7 ; sys_platform == "win32"
|
|||
# via -r requirements/base.txt
|
||||
pymysql==1.1.0 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pyopenssl==23.2.0
|
||||
pyopenssl==24.0.0
|
||||
# via -r requirements/base.txt
|
||||
python-dateutil==2.8.2
|
||||
# via -r requirements/base.txt
|
||||
python-gnupg==0.5.1
|
||||
python-gnupg==0.5.2
|
||||
# via -r requirements/base.txt
|
||||
pythonnet==3.0.1 ; sys_platform == "win32"
|
||||
pythonnet==3.0.3 ; sys_platform == "win32"
|
||||
# via -r requirements/base.txt
|
||||
pytz==2023.3.post1
|
||||
pytz==2024.1
|
||||
# via tempora
|
||||
pywin32==306 ; sys_platform == "win32"
|
||||
# via
|
||||
|
@ -118,7 +118,7 @@ pywin32==306 ; sys_platform == "win32"
|
|||
# wmi
|
||||
pyyaml==6.0.1
|
||||
# via -r requirements/base.txt
|
||||
pyzmq==25.1.1
|
||||
pyzmq==25.1.2
|
||||
# via -r requirements/zeromq.txt
|
||||
requests==2.31.0
|
||||
# via -r requirements/base.txt
|
||||
|
@ -133,7 +133,9 @@ timelib==0.3.0
|
|||
tornado==6.3.3
|
||||
# via -r requirements/base.txt
|
||||
typing-extensions==4.8.0
|
||||
# via pydantic
|
||||
# via
|
||||
# inflect
|
||||
# pydantic
|
||||
urllib3==1.26.18
|
||||
# via requests
|
||||
wmi==1.5.1 ; sys_platform == "win32"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
-r base.txt
|
||||
-r crypto.txt
|
||||
|
||||
pyzmq>=24.0.0
|
||||
pyzmq>=25.1.2
|
||||
|
|
|
@ -420,6 +420,7 @@ def set_logging_options_dict(opts):
|
|||
except AttributeError:
|
||||
pass
|
||||
set_logging_options_dict.__options_dict__ = opts
|
||||
set_lowest_log_level_by_opts(opts)
|
||||
|
||||
|
||||
def freeze_logging_options_dict():
|
||||
|
|
|
@ -3,8 +3,6 @@ Encapsulate the different transports available to Salt.
|
|||
|
||||
This includes client side transport, for the ReqServer and the Publisher
|
||||
"""
|
||||
|
||||
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
|
@ -605,14 +603,22 @@ class AsyncPubChannel:
|
|||
def _decode_payload(self, payload):
|
||||
# we need to decrypt it
|
||||
log.trace("Decoding payload: %s", payload)
|
||||
reauth = False
|
||||
if payload["enc"] == "aes":
|
||||
self._verify_master_signature(payload)
|
||||
try:
|
||||
payload["load"] = self.auth.crypticle.loads(payload["load"])
|
||||
except salt.crypt.AuthenticationError:
|
||||
yield self.auth.authenticate()
|
||||
payload["load"] = self.auth.crypticle.loads(payload["load"])
|
||||
|
||||
reauth = True
|
||||
if reauth:
|
||||
try:
|
||||
yield self.auth.authenticate()
|
||||
payload["load"] = self.auth.crypticle.loads(payload["load"])
|
||||
except salt.crypt.AuthenticationError:
|
||||
log.error(
|
||||
"Payload decryption failed even after re-authenticating with master %s",
|
||||
self.opts["master_ip"],
|
||||
)
|
||||
raise tornado.gen.Return(payload)
|
||||
|
||||
def __enter__(self):
|
||||
|
|
|
@ -56,10 +56,6 @@ class ReqServerChannel:
|
|||
transport = salt.transport.request_server(opts, **kwargs)
|
||||
return cls(opts, transport)
|
||||
|
||||
@staticmethod
|
||||
def _clean_key(key):
|
||||
return key.strip().replace("\r", "").replace("\n", "")
|
||||
|
||||
def __init__(self, opts, transport):
|
||||
self.opts = opts
|
||||
self.transport = transport
|
||||
|
@ -385,7 +381,7 @@ class ReqServerChannel:
|
|||
elif os.path.isfile(pubfn):
|
||||
# The key has been accepted, check it
|
||||
with salt.utils.files.fopen(pubfn, "r") as pubfn_handle:
|
||||
if self._clean_key(pubfn_handle.read()) != self._clean_key(load["pub"]):
|
||||
if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
|
||||
log.error(
|
||||
"Authentication attempt from %s failed, the public "
|
||||
"keys did not match. This may be an attempt to compromise "
|
||||
|
@ -494,9 +490,7 @@ class ReqServerChannel:
|
|||
# case. Otherwise log the fact that the minion is still
|
||||
# pending.
|
||||
with salt.utils.files.fopen(pubfn_pend, "r") as pubfn_handle:
|
||||
if self._clean_key(pubfn_handle.read()) != self._clean_key(
|
||||
load["pub"]
|
||||
):
|
||||
if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
|
||||
log.error(
|
||||
"Authentication attempt from %s failed, the public "
|
||||
"key in pending did not match. This may be an "
|
||||
|
@ -552,9 +546,7 @@ class ReqServerChannel:
|
|||
# so, pass on doing anything here, and let it get automatically
|
||||
# accepted below.
|
||||
with salt.utils.files.fopen(pubfn_pend, "r") as pubfn_handle:
|
||||
if self._clean_key(pubfn_handle.read()) != self._clean_key(
|
||||
load["pub"]
|
||||
):
|
||||
if salt.crypt.clean_key(pubfn_handle.read()) != load["pub"]:
|
||||
log.error(
|
||||
"Authentication attempt from %s failed, the public "
|
||||
"keys in pending did not match. This may be an "
|
||||
|
|
|
@ -1203,7 +1203,7 @@ class LocalClient:
|
|||
continue
|
||||
|
||||
# Anything below this point is expected to be a job return event.
|
||||
if not raw["tag"].startswith(f"salt/job/{jid}/ret"):
|
||||
if not raw["tag"].startswith(f"salt/job/{jid}/ret/"):
|
||||
log.debug("Skipping non return event: %s", raw["tag"])
|
||||
continue
|
||||
if "return" not in raw["data"]:
|
||||
|
|
|
@ -1066,7 +1066,7 @@ DEFAULT_MINION_OPTS = immutabletypes.freeze(
|
|||
"pillar_cache": False,
|
||||
"pillar_cache_ttl": 3600,
|
||||
"pillar_cache_backend": "disk",
|
||||
"request_channel_timeout": 30,
|
||||
"request_channel_timeout": 60,
|
||||
"request_channel_tries": 3,
|
||||
"gpg_cache": False,
|
||||
"gpg_cache_ttl": 86400,
|
||||
|
@ -3961,6 +3961,14 @@ def apply_master_config(overrides=None, defaults=None):
|
|||
|
||||
opts = defaults.copy()
|
||||
opts["__role"] = "master"
|
||||
|
||||
# Suppress fileserver update in FSChan, for FSClient instances generated
|
||||
# during Pillar compilation. The master daemon already handles FS updates
|
||||
# in its maintenance thread. Refreshing during Pillar compilation slows
|
||||
# down Pillar considerably (even to the point of timeout) when there are
|
||||
# many gitfs remotes.
|
||||
opts["__fs_update"] = True
|
||||
|
||||
_adjust_log_file_override(overrides, defaults["log_file"])
|
||||
if overrides:
|
||||
opts.update(overrides)
|
||||
|
|
|
@ -83,6 +83,13 @@ if not HAS_M2 and not HAS_CRYPTO:
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def clean_key(key):
|
||||
"""
|
||||
Clean the key so that it only has unix style line endings (\\n)
|
||||
"""
|
||||
return "\n".join(key.strip().splitlines())
|
||||
|
||||
|
||||
def read_dropfile(cachedir):
|
||||
dfn = os.path.join(cachedir, ".dfn")
|
||||
try:
|
||||
|
@ -273,7 +280,7 @@ def _get_key_with_evict(path, timestamp, passphrase):
|
|||
Load a private key from disk. `timestamp` above is intended to be the
|
||||
timestamp of the file's last modification. This fn is memoized so if it is
|
||||
called with the same path and timestamp (the file's last modified time) the
|
||||
second time the result is returned from the memoiziation. If the file gets
|
||||
second time the result is returned from the memoization. If the file gets
|
||||
modified then the params are different and the key is loaded from disk.
|
||||
"""
|
||||
log.debug("salt.crypt._get_key_with_evict: Loading private key")
|
||||
|
@ -489,7 +496,7 @@ class MasterKeys(dict):
|
|||
)
|
||||
if os.path.isfile(self.sig_path):
|
||||
with salt.utils.files.fopen(self.sig_path) as fp_:
|
||||
self.pub_signature = fp_.read()
|
||||
self.pub_signature = clean_key(fp_.read())
|
||||
log.info(
|
||||
"Read %s's signature from %s",
|
||||
os.path.basename(self.pub_path),
|
||||
|
@ -607,7 +614,7 @@ class MasterKeys(dict):
|
|||
with salt.utils.files.fopen(path, "wb+") as wfh:
|
||||
wfh.write(key.publickey().exportKey("PEM"))
|
||||
with salt.utils.files.fopen(path) as rfh:
|
||||
return rfh.read()
|
||||
return clean_key(rfh.read())
|
||||
|
||||
def get_ckey_paths(self):
|
||||
return self.cluster_pub_path, self.cluster_rsa_path
|
||||
|
@ -1011,11 +1018,11 @@ class AsyncAuth:
|
|||
"clean out the keys. The Salt Minion will now exit."
|
||||
)
|
||||
# Add a random sleep here for systems that are using a
|
||||
# a service manager to immediately restart the service
|
||||
# to avoid overloading the system
|
||||
# service manager to immediately restart the service to
|
||||
# avoid overloading the system
|
||||
time.sleep(random.randint(10, 20))
|
||||
sys.exit(salt.defaults.exitcodes.EX_NOPERM)
|
||||
# has the master returned that its maxed out with minions?
|
||||
# Has the master returned that it's maxed out with minions?
|
||||
elif payload["ret"] == "full":
|
||||
return "full"
|
||||
else:
|
||||
|
@ -1117,7 +1124,7 @@ class AsyncAuth:
|
|||
except Exception: # pylint: disable=broad-except
|
||||
pass
|
||||
with salt.utils.files.fopen(self.pub_path) as f:
|
||||
payload["pub"] = f.read()
|
||||
payload["pub"] = clean_key(f.read())
|
||||
return payload
|
||||
|
||||
def decrypt_aes(self, payload, master_pub=True):
|
||||
|
@ -1340,11 +1347,9 @@ class AsyncAuth:
|
|||
m_pub_exists = os.path.isfile(m_pub_fn)
|
||||
if m_pub_exists and master_pub and not self.opts["open_mode"]:
|
||||
with salt.utils.files.fopen(m_pub_fn) as fp_:
|
||||
local_master_pub = fp_.read()
|
||||
local_master_pub = clean_key(fp_.read())
|
||||
|
||||
if payload["pub_key"].replace("\n", "").replace(
|
||||
"\r", ""
|
||||
) != local_master_pub.replace("\n", "").replace("\r", ""):
|
||||
if payload["pub_key"] != local_master_pub:
|
||||
if not self.check_auth_deps(payload):
|
||||
return ""
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue