Commit graph

54 commits

Author SHA1 Message Date
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
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
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
af59576d96
Merge 3006.x into master 2023-08-06 08:13:52 +01: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
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
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
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
5a03a24ea9 Upgrade remaining test dependencies
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-14 14:33:46 +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
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
69b890c0f6 Bump to junos-eznc==2.6.7 and ncclient==0.6.13
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
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
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
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
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
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
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
0a11311113 Bump to msgpack==1.0.5
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Pedro Algarvio
8b8c239ed7 Bump to certifi==2023.5.7
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Pedro Algarvio
b88f6f1800 Properly constrain CI requirements
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Daniel A. Wozniak
3239877c78 Bump tornado to the newest version 6.3.2 2023-05-31 15:59:57 -07:00
Megan Wilhite
fe0083720e Update requests 2023-05-30 07:03:12 +01:00
Megan Wilhite
dc8baed208 Update requests 2023-05-29 18:08:57 +01:00
Daniel A. Wozniak
166c07f6da Get rid of RequestContext 2023-05-23 14:41:30 -07:00
cmcmarrow
13437829fc Merge remote-tracking branch 'upstream/3006.x' into merge-forward/3006.x/master 2023-04-20 17:39:55 -05:00
Megan Wilhite
4013d4e9a5 Use system configs if user is salt 2023-04-15 20:49:08 +01:00
Megan Wilhite
60d790597a Add test to ensure salt user is running salt-master 2023-04-15 20:49:08 +01:00
Twangboy
e5c58d9ab9 Bump pyzmq to 25.0.2 on Windows 2023-04-13 12:32:43 +01:00
Daniel A. Wozniak
3caa552c64 Add python 3.11 to pkg and ci requirements 2023-04-12 06:47:29 +01:00
Pedro Algarvio
f661bda53b Migrate the package download tests to onedir
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-03-16 21:00:40 +00:00
Twangboy
3643d65358 Fix pre-commit 2023-02-28 15:27:46 +00:00
Twangboy
ef773ece29 Fix pre-commit 2023-02-28 15:27:46 +00:00