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

90 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
ef367f4450
Fix changed requirements during merge forward 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-08-06 08:36:32 +01:00
Pedro Algarvio
af59576d96
Merge 3006.x into master 2023-08-06 08:13:52 +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
Pedro Algarvio
1decaf5711
Merge 3006.x into master 2023-07-28 11:20:24 +01:00
Pedro Algarvio
112cbda97a
Merge 3006.x into master 2023-07-21 18:11:52 +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
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
Pedro Algarvio
94bce224fa added xmldiff package for testing expected output vs returned output 2023-06-09 19:12:03 +00:00
Pedro Algarvio
fcfe059402 Updating test requirements for saltcheck junit output 2023-06-09 19:12:03 +00: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
36a198935a Bump to yamllint==1.32.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
cd91e01917 Bump to pygit2==1.12.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
8cb1d6d899 Bump to pywinrm==0.4.3 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
15c1f5f870 Bump to watchdog==3.0.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
1851456b3f Bump to pyvmomi==8.0.1.0.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
7bbd386a1f Bump to moto==4.1.10 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
357e02f152 Bump to mako==1.2.4 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
11204d5d12 Bump to genshi==0.7.7 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
a2f0f1d783 Bump to pytest-skip-markers==1.4.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
d94bb4475f Bump to pytest==7.3.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
5b1031de0d Revert "Bump to jsonschema==4.17.3" 
This reverts commit fa6661800dbed28cb8dfe1a25f698aeb65616b98.
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
d933a235aa Bump to jsonschema==4.17.3 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
8c268f47ce Bump to docker==6.1.2 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
32ae15edb6 Bump to dnspython==2.3.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
ae37cc1d6b Bump to clustershell==1.9.1 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
fc1b7b2005 Bump to cassandra-driver==3.27.0 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00
Pedro Algarvio
8315107e91 Bump to boto3==1.26.143, botocore==1.29.143 and s3transfer==0.6.1 
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