saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
118901 commits 34 branches 292 tags 802 MiB
Commit graph

247 commits

Author SHA1 Message Date
Pedro Algarvio
2702705043
Merge 3006.x into master 2023-09-29 18:15:30 +01:00
Pedro Algarvio
19712b22f2 Bump to pytest-salt-factories==1.0.0rc27 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:12:59 +01:00
Pedro Algarvio
6dff22e227 Properly constraint CI requirements from PKG requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:12:59 +01:00
Pedro Algarvio
b85da8d8b0
Merge 3006.x into master 2023-09-26 07:01:03 +01:00
Pedro Algarvio
5241abd10a Bump to cryptography==41.0.4 due to https://github.com/advisories/GHSA-v8gr-m533-ghj9 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 21:03:45 +01:00
Pedro Algarvio
e348a49ed5 Bump to pytest-salt-factories==1.0.0rc26 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 17:26:12 +01:00
Pedro Algarvio
f1c619292f
Adjust a few requirements that got changed during the conflict solving 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:53:57 +01:00
Pedro Algarvio
5e093b3b8d
Merge 3006.x into master 2023-09-25 11:41:20 +01:00
Pedro Algarvio
070774f38c Fix pre-commit regarding static requirements compilation 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-25 11:29:15 +01:00
Pedro Algarvio
519666b0cf Set cgroupns to host to fix the libvirt migration tests. 
This needs a newer version of the python docker package.

The breakage was due to updating the docker container used. - https://github.com/saltstack/salt-ci-containers/pull/42

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
9fb51b083a Bump to docker==6.1.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-24 22:10:53 +01:00
Pedro Algarvio
c07f66261e
Merge 3006.x into master 2023-09-20 15:52:18 +01:00
Pedro Algarvio
cbcbe14d47 Bump to pytest-salt-factories==1.0.0rc25 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-19 20:37:29 +00:00
Pedro Algarvio
5033860d2a Don't use requirements with extras as that breaks pip constraints usage 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-19 20:37:29 +00:00
Pedro Algarvio
623944d2a5
The master branch(Upcoming 3007.0 release) is already Python >= 3.8 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-13 16:36:35 +01:00
Pedro Algarvio
74f43bb5d2
Upgrade requirements downgraded during the merge forward conflict resolve 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-13 16:24:16 +01:00
Pedro Algarvio
f389c29473
Merge 3006.x into master 
Conflicts:
 * requirements/darwin.txt
 * requirements/pytest.txt
 * requirements/static/ci/common.in
 * requirements/static/ci/darwin.in
 * requirements/static/ci/freebsd.in
 * requirements/static/ci/linux.in
 * requirements/static/ci/py3.10/cloud.txt
 * requirements/static/ci/py3.10/darwin.txt
 * requirements/static/ci/py3.10/freebsd.txt
 * requirements/static/ci/py3.10/lint.txt
 * requirements/static/ci/py3.10/linux.txt
 * requirements/static/ci/py3.10/windows.txt
 * requirements/static/ci/py3.11/windows.txt
 * requirements/static/ci/py3.7/cloud.txt
 * requirements/static/ci/py3.7/freebsd.txt
 * requirements/static/ci/py3.7/lint.txt
 * requirements/static/ci/py3.7/linux.txt
 * requirements/static/ci/py3.8/cloud.txt
 * requirements/static/ci/py3.8/freebsd.txt
 * requirements/static/ci/py3.8/lint.txt
 * requirements/static/ci/py3.8/linux.txt
 * requirements/static/ci/py3.8/windows.txt
 * requirements/static/ci/py3.9/cloud.txt
 * requirements/static/ci/py3.9/darwin.txt
 * requirements/static/ci/py3.9/freebsd.txt
 * requirements/static/ci/py3.9/lint.txt
 * requirements/static/ci/py3.9/linux.txt
 * requirements/static/ci/py3.9/windows.txt
 * requirements/static/pkg/freebsd.in
 * requirements/static/pkg/linux.in
 * requirements/static/pkg/py3.10/darwin.txt
 * requirements/static/pkg/py3.10/windows.txt
 * requirements/static/pkg/py3.11/windows.txt
 * requirements/static/pkg/py3.8/windows.txt
 * requirements/static/pkg/py3.9/darwin.txt
 * requirements/static/pkg/py3.9/windows.txt
 * requirements/windows.txt
 2023-09-13 16:09:29 +01:00
Pedro Algarvio
fd0a725d7e Bump to gitpython==3.1.35 
Due to https://github.com/advisories/GHSA-cwvm-v4w8-q58c
Due to https://github.com/advisories/GHSA-wfm5-v35h-vwf4

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 09:23:32 +01:00
Pedro Algarvio
c3477da2dd The 3006.x branch is Python >= 3.7 already. Remove unnecessary python_version markers. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-12 09:23:32 +01:00
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04:00
Pedro Algarvio
386799f623 Update to gitpython>=3.1.32 due to https://github.com/advisories/GHSA-pr76-5cm5-w9cj 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-16 01:38:20 +01:00
Pedro Algarvio
22107ebd32
Merge 3006.x into master 2023-08-15 22:29:25 +01:00
Pedro Algarvio
af59576d96
Merge 3006.x into master 2023-08-06 08:13:52 +01:00
Megan Wilhite
a46d846ab6 Update to cryptography==41.0.3 due to https://github.com/advisories/GHSA-jm77-qphf-c4w8 2023-08-06 07:31:13 +01:00
Pedro Algarvio
5f64fbd886 Bump to pytest-salt-factories==1.0.0rc25 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-02 17:40:00 +00:00
Pedro Algarvio
43c7376f69 Bump to pytest-skip-markers==1.4.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-02 17:40:00 +00:00
Pedro Algarvio
61fc2933c4 Bump to pytest-salt-factories==1.0.0rc24 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-02 17:40:00 +00:00
David Murphy
80785185ac Remove cython and other pyyaml changes, now pyyaml 6.0.1 fixes cython 3.0 issue 2023-07-28 18:24:59 +01:00
David Murphy
af8d19061a Updated test to use importorskip, downgrade pyyaml to 5.3.1 to work around cython 3.0 issues 2023-07-28 18:24:59 +01:00
David Murphy
2d2b720871 Removed debug logging and updated requirements per reviewer suggestions 2023-07-28 18:24:59 +01:00
David Murphy
244f4a7dad Updat4ed immutables==0.15 where applicable as per reviewer comments 2023-07-28 18:24:59 +01:00
David Murphy
d65aed8ced Updated immutables as per reviewer comments 2023-07-28 18:24:59 +01:00
David Murphy
497b9b117d Remove debig log statements and update immutables version used 2023-07-28 18:24:59 +01:00
David Murphy
c6b4671b86 Updated versions of cffi used 2023-07-28 18:24:59 +01:00
David Murphy
d2f1900bd9 Adjusted pynacl version per python version 2023-07-28 18:24:59 +01:00
David Murphy
2824bb9263 Updates due to rebase 2023-07-28 18:24:59 +01:00
Pedro Algarvio
1decaf5711
Merge 3006.x into master 2023-07-28 11:20:24 +01:00
Pedro Algarvio
301df340e7 Bump to certifi==2023.07.22 due to https://github.com/advisories/GHSA-xqr8-7jwr-rhp7 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-28 10:51:00 +01:00
Pedro Algarvio
112cbda97a
Merge 3006.x into master 2023-07-21 18:11:52 +01:00
Pedro Algarvio
145a0ed6fc Bump to aiohttp==3.8.5 due to https://github.com/advisories/GHSA-45c4-8wx5-qw6w 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-21 18:00:56 +01:00
Pedro Algarvio
2450240d5c
Bump a few requirements that got downgraded in the merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-18 17:38:08 +01:00
Pedro Algarvio
df09fd980d
Merge 3006.x into master 2023-07-18 16:37:08 +01:00
Pedro Algarvio
48749b15bc Bump to pyyaml==6.0.1 due to https://github.com/yaml/pyyaml/issues/601 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-18 15:11:49 +01:00
Pedro Algarvio
53aafe7eba Bump to pyyaml==6.0.1 due to https://github.com/yaml/pyyaml/issues/601 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-18 14:21:40 +01:00
Pedro Algarvio
5b2e752d5e Bump to cryptography==41.0.2 to address GHSA-cf7p-gm2m-833m 
The cryptography package before 41.0.2 for Python mishandles SSH certificates that have critical options.
References:

https://nvd.nist.gov/vuln/detail/CVE-2023-38325
[https://github.com/pyca/cryptography/issues/9207](pyca/cryptography#9207)
[https://github.com/pyca/cryptography/issues/9208](pyca/cryptography#9208)
[https://github.com/pyca/cryptography/compare/41.0.1...41.0.2](pyca/cryptography@41.0.1...41.0.2)
https://pypi.org/project/cryptography/#history
[1ca7adc97b](pyca/cryptography@1ca7adc)

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-16 17:44:45 -07:00
Pedro Algarvio
3d097b8ed5 Upgrade to cryptography==41.0.1(and therefor pyopenssl==23.2.0 due to https://github.com/advisories/GHSA-5cpq-8wj7-hf2v 
This only really impacts pip installs of Salt and the windows onedir
since the linux and macos onedir build every package dependency from
source, not from pre-existing wheels.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-06 18:04:43 +01:00
Pedro Algarvio
d91988fa1c Bump to pytest-shell-utilities==1.8.0 which officially support Py3.11 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-03 19:35:54 +01:00
Pedro Algarvio
ced7fea9f4 Don't use requirements with extras as that breaks pip constraints usage 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-19 07:42:10 +01:00
Pedro Algarvio
5a03a24ea9 Upgrade remaining test dependencies 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-14 14:33:46 +01:00
Pedro Algarvio
4886b6de2d
Merge 3006.x into master 2023-06-11 10:01:52 +01:00