Commit graph

307 commits

Author SHA1 Message Date
Pedro Algarvio
b7630f3b08
Merge 3006.x into 3007.x 2024-02-29 14:25:24 +00:00
Pedro Algarvio
fce314e011 Upgrade to cryptography==42.0.5 due to a few security issues
* https://github.com/advisories/GHSA-9v9h-cgj8-h64p
* https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
* https://github.com/advisories/GHSA-6vqw-3v5j-54x4
2024-02-28 08:56:13 +00:00
Pedro Algarvio
34ab8c732b
Merge 3006.x into 3007.x 2024-02-19 13:10:20 +00:00
Daniel A. Wozniak
6703d19bce Upgrade pyzmq on darwin due to build failure 2024-02-18 19:48:18 -07:00
Pedro Algarvio
3e540257c5 Bump to pytest==7.3.2 since it handles pytest-timeout without tracebacks 2024-02-18 19:48:18 -07:00
Pedro Algarvio
bf02ba409a Bump to cryptography==42.0.3 due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f 2024-02-18 19:48:18 -07:00
Pedro Algarvio
7f29337f70
Bump to pyzmq==25.1.2 to hopefully address some build issues on MacOS 2024-02-15 13:57:02 +00:00
Pedro Algarvio
4de6b1011f
Merge 3006.x into 3007.x 2024-02-07 11:09:05 +00:00
Pedro Algarvio
bcd236d48c Bump to cryptography==42.0.0 due to https://github.com/advisories/GHSA-3ww4-gg4f-jr7f 2024-02-07 01:08:55 -07:00
Pedro Algarvio
f96f8e0130
Merge 3006.x into 3007.x 2024-01-31 11:20:17 +00:00
Pedro Algarvio
95e7e330d7 Bump to aiohttp==3.9.2 due to https://github.com/advisories/GHSA-5h86-8mv2-jq9f 2024-01-31 11:14:58 +00:00
Pedro Algarvio
5ea370c1fb
Merge 3006.x into 3007.x 2024-01-25 09:47:57 +00:00
Pedro Algarvio
20fd342182 Only show system information.
The test plan was always wrong due to the kind of test selection that
was done.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-01-25 08:15:23 +00:00
Pedro Algarvio
3448e40847
Merge 3006.x into 3007.x 2024-01-24 15:02:25 +00:00
Thomas Phipps
c91e1d8a5e add https to proxy so that requests knows how to proxy https 2024-01-23 10:15:26 -07:00
Pedro Algarvio
82e4e2b55f
Merge 3006.x into 3007.x 2024-01-16 11:50:44 +00:00
Pedro Algarvio
71b68d722c Bump to jinja2==3.1.3 due to https://github.com/advisories/GHSA-h5c8-rqwp-cp95
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-01-16 09:23:16 +00:00
Pedro Algarvio
6fb35bf88f Bump to gitpython==3.1.41 due to https://github.com/advisories/GHSA-2mqj-m65w-jghx
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-01-16 09:23:16 +00:00
Pedro Algarvio
d3fad04d9e Bump to pycryptodome==3.19.1 and pycryptodomex==3.19.1 due to https://github.com/advisories/GHSA-j225-cvw7-qrx7
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-01-16 09:23:16 +00:00
Pedro Algarvio
68ecf808e3
Merge 3006.x into 3007.x 2024-01-05 11:29:13 +00:00
Daniel A. Wozniak
0106e1dbf6 Fix pre-commit 2023-12-30 01:34:25 -07:00
Daniel A. Wozniak
10b714cf55 Simplify payload unpacking. 2023-12-28 00:29:50 -07:00
Pedro Algarvio
15616715d4 Bump to paramiko==3.4.0 due to https://github.com/advisories/GHSA-45x7-px36-x8w8
A dependency of paramiko also had to be upgraded, `bcrypt==4.1.2`

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-12-26 21:47:47 -07:00
Pedro Algarvio
7fc7572810
Bump to cffi=1.16.0
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-29 21:39:40 +00:00
Pedro Algarvio
02c3b89e40
Merge 3006.x into master 2023-11-29 18:31:52 +00:00
Pedro Algarvio
28039bda69 Bump to cryptography==41.0.7 due to https://github.com/advisories/GHSA-jfhm-5ghh-2f97
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-29 10:57:19 -07:00
Pedro Algarvio
f60c87aacb
Merge 3006.x into master 2023-11-28 17:46:50 +00:00
Pedro Algarvio
eaf5245965 Let's fake the filesystem instead
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-27 21:13:22 +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
163d34f430 Drop cloud specific requirements from MacOS's base requirements.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-08 16:56:36 +00:00
Pedro Algarvio
d6b7d47430 GitPython is no longer a base dependency for Windows and MacOS.
The plan is to make pygit2 the base dependency before 3007.0 comes out.

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