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
119524 commits 34 branches 292 tags 802 MiB
Commit graph

257 commits

Author SHA1 Message Date
Pedro Algarvio
d55cf91a21
Downgrade ansible, it was not meant to be upgraded on merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-27 16:43:18 +00:00
Pedro Algarvio
a420d94431
Merge 3006.x into master 2023-11-26 16:10:40 +00:00
Pedro Algarvio
705581130a Bump to pytest-salt-factories==1.0.0rc28 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-26 13:05:11 +00:00
Pedro Algarvio
5f5651f454 Upgrade to aiohttp>=3.8.6 due to https://github.com/advisories/GHSA-gfw2-4jvh-wgfg 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-23 07:43:39 +00:00
Pedro Algarvio
63ade50e2b Bump to paramiko==3.3.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-08 16:56:36 +00:00
Pedro Algarvio
e35033aebc Consolidate requirements into requirements/base.txt 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-08 16:56:36 +00:00
Pedro Algarvio
c78b214d0e
Bump a few requirements that got downgraded during the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-05 17:09:16 +00:00
Pedro Algarvio
ba85fb6c07
Merge 3006.x into master 2023-11-05 16:52:51 +00:00
Pedro Algarvio
11783d6221 Bump to werkzeug==3.0.1 due to https://github.com/advisories/GHSA-hrfv-mqp8-q5rw 
Does not upgrade for Py3.7 since this version of werkzeug does not support 3.7.
This also upgrades to `pytest-httpserver==1.0.8`

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
Pedro Algarvio
5e6fcf022b Backport https://github.com/saltstack/salt/pull/64323 (Just the requirements) 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
Pedro Algarvio
3d56434d3e Upgrade to `pytest-skip-markers==1.5.0` 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-11-04 06:27:55 +00:00
Pedro Algarvio
e7b5f24ab3
Merge 3006.x into master 2023-11-03 20:05:20 +00:00
cmcmarrow
4fd5072dbd bumpy pygit2 2023-11-03 05:44:26 +00:00
Pedro Algarvio
3843bdab93
Upgrade some dependencies which got downgraded on the merge-forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 22:44:56 +00:00
Pedro Algarvio
c8f5d589d2
Merge 3006.x into master 2023-10-29 22:25:59 +00:00
Pedro Algarvio
be3d892fc9
Remove docker from requirements/static/ci/common.in 
It was wrongly added whew resolving conflicts while merging forward

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-29 11:00:57 +00:00
Pedro Algarvio
16dce0b4cc
Merge v3006.4 into 3006.x 2023-10-29 09:24:34 +00:00
Megan Wilhite
ec38a2e5bb [3006.4] Update gitpython to 3.1.37 2023-10-12 12:52:14 -06:00
Pedro Algarvio
e0bc1bd255 Upgrade to tornado>=6.3.3 due to https://github.com/advisories/GHSA-qppv-j76h-2rpx 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-12 19:07:46 +01:00
Megan Wilhite
d7b8fdf9d7 Bump urllib3 to 1.26.17 or 2.0.6 2023-10-09 13:22:08 +00:00
Pedro Algarvio
57d138ab32 Upgrade to mock==5.1.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-06 20:09:46 +01:00
Pedro Algarvio
8e07f20ef0
Merge 3006.x into master 2023-10-04 21:25:32 +01:00
Pedro Algarvio
1981c3784d Switch to more-itertools when splitting the tests into slices/chunks 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-04 20:54:42 +01:00
Pedro Algarvio
37ca0c08d0 Upgrade to mock==5.1.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-04 20:54:42 +01:00
Pedro Algarvio
9b22e5a334 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-10-02 08:51:34 +01:00
Pedro Algarvio
9cf8048421 The 3006.x branch is Python >= 3.7 already. Remove unnecessary python_version markers. 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-10-02 08:51:34 +01:00
Pedro Algarvio
5a323034b4 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-10-02 08:51:21 +01:00
Pedro Algarvio
2702705043
Merge 3006.x into master 2023-09-29 18:15:30 +01:00
Pedro Algarvio
e3cbe1fac5 Fix pre-commit regarding static requirements compilation 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:01:59 +00:00
Pedro Algarvio
88365fb69e 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-29 16:01:59 +00:00
Pedro Algarvio
c33977f96f Bump to docker==6.1.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:01:59 +00: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
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