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

61 commits

Author SHA1 Message Date
Pedro Algarvio
2702705043
Merge 3006.x into master 2023-09-29 18:15:30 +01:00
Pedro Algarvio
b85da8d8b0
Merge 3006.x into master 2023-09-26 07:01:03 +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
c07f66261e
Merge 3006.x into master 2023-09-20 15:52:18 +01:00
MKLeb
432abe78f3
pin psutil for the upgrade tests for now 2023-09-19 15:57:06 -04: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
MKLeb
bee29be6dd
Merge remote-tracking branch 'upstream/3006.x' into mf/master/3006.x 2023-09-08 16:25:39 -04: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
Pedro Algarvio
1decaf5711
Merge 3006.x into master 2023-07-28 11:20:24 +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
7d6f51f871
Merge 3006.x into master 2023-07-08 21:30:11 +01:00
Pedro Algarvio
3a91a197d4 Downgrade to cffi==1.14.6 on windows to fix the package upgrade tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-08 19:01:55 +01:00
Pedro Algarvio
892aeeda0f Downgrade to psutil==5.8.0 on windows to fix the package upgrade tests 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-07-08 19:01:55 +01:00
Pedro Algarvio
05d3295eba Revert "Bump to immutables==0.19" 
This reverts commit 825d715356e6319f89f90fade352e727f8aae4cb.

The reason being that it breaks salt-ssh into systems with python older
than 3.6, which is apparently still supported.
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
9017809e4e Bump to pyopenssl==23.2.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
9aeea6bbbf Bump to typing-extensions==4.6.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
68e4d2e7c3 Bump to zipp==3.15.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
319730b7a7 Bump to portend==3.1.0 and tempora==5.2.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
0e63e023b9 Bump to idna==3.4 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
679651299a Upgrade all jaraco.* libraries 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
cb4a3e7ead Bump to more-itertools==9.1.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
679d5f83ea Bump to pytz==2023.3 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
374a084403 Bump to cheroot==10.0.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
588cd703af Bump to immutables==0.19 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
1c0593b4d6 Bump to importlib-metadata==6.6.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
4b74e4612a Bump to timelib==0.3.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
a302fcc166 Bump to python-gnupg==0.5.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
017c230f90 Bump to python-dateutil==2.8.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
023a54beb5 Revert "Bump to pycryptodomex==3.18.0" 
This reverts commit 2def14aefb804a0eb633d21626b5b1e1a4063edb.
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
44b3f7015a Bump to pycryptodomex==3.18.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
b763dfa21c Bump to pycparser==2.21 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
ef6d0e93b6 Bump to lxml==4.9.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
e8c536d1d8 Bump to gitdb==4.0.10 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
e1f962e0d8 Bump to gitpython==3.1.31 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
228232f570 Bump to cherrypy==18.8.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
defca6ba10 Remove ioloop>=0.1a0 from the windows requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
6e26da3c9f Bump to cryptography==40.0.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
542f97bf16 Bump to pyopenssl==23.1.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
4e4ac4b177 Bump to pywin32==306 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
4574d8722d Bump to pyzmq==25.1.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
40f86e1898 Bump to looseversion==1.2.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
cbb617d478 Bump to packaging==23.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
9a04e5ba8f Bump to psutil==5.9.5 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
6bb2906634 Bump to distro==1.8.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
410e70bfda Bump to pyyaml==6.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00