saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
122059 commits 34 branches 292 tags 803 MiB
Commit graph

66 commits

Author SHA1 Message Date
Daniel A. Wozniak
c695e0bcff Merge branch '3006.x' into merge/3007.x/3006.x 2025-03-07 15:05:05 -07:00
Daniel A. Wozniak
bf0c1331d5 Update requirements to account for cves 
Name         Version ID                  Fix Versions
------------ ------- ------------------- -------------
jinja2       3.1.4   GHSA-q2x7-8rv6-6q7h 3.1.5
jinja2       3.1.4   GHSA-gmj6-6f8f-6699 3.1.5
urllib3      1.26.18 GHSA-34jh-p97f-mpxf 1.26.19,2.2.2
 2025-03-06 22:20:11 -07:00
David Murphy
bc5b823726 Restore requirements after testing with pygit2 v1.17.0 successfully 2025-01-30 14:43:31 -07:00
David Murphy
19fe9b4bb0 WIP - Testing with pygit2 v1.17.1 2025-01-30 14:43:31 -07:00
Daniel A. Wozniak
1a834761bf Merge branch '3006.x' into merge/3007.x/3006.x 2024-10-25 17:07:29 -07:00
David Murphy
c61822fbd9 Updates due to pytest-shell-utilities and psutil version updates 2024-10-24 08:57:52 -07:00
David Murphy
e4b4f571f5 Fix nightly builds and update psutil to 6.0.0 or greater 2024-10-24 08:57:52 -07:00
David Murphy
628c2d2095 Add cryptography back as a dependency for Salt 3006 to base.txt requirements 2024-10-21 14:13:24 -07:00
Daniel A. Wozniak
8dd2e3473c Merge branch '3006.x' into merge/3007.x/3006.x 2024-08-26 19:26:17 -07:00
David Murphy
6e43c93634 Use updated pytest-skip-markers to pick up corrected MacOS Arm64 support 2024-08-12 08:28:47 -07:00
Daniel A. Wozniak
176bd3aca8 Update certifi in answer to dependabot 2024-07-18 21:25:04 -07:00
Daniel A. Wozniak
62903c242f Merge forward 3006.x to 3007.x 2024-07-01 08:29:08 -07:00
Daniel A. Wozniak
3735415fbc Bump requests and docker requirements 2024-06-24 09:37:46 -07:00
Daniel A. Wozniak
60cc8dbce8 Merge forward 3006.x into 3007.x 2024-06-21 23:53:49 -07:00
David Murphy
ae459fa73a Update to include croniter in pkg requirements 2024-06-19 11:23:50 -07:00
Pedro Algarvio
d2d49f524d Bump to pydantic==2.6.4 due to https://github.com/advisories/GHSA-mr82-8j83-vxmv 2024-05-10 19:23:31 +01:00
Pedro Algarvio
c6acd0066f Bump to pydantic==2.6.1 due to https://github.com/advisories/GHSA-mr82-8j83-vxmv 2024-05-10 19:23:31 +01:00
Pedro Algarvio
52322431b2
Merge 3006.x into 3007.x 2024-05-09 09:34:14 +01:00
Pedro Algarvio
3ec5b91bbd Bump to `jinja2==3.1.4` due to https://github.com/advisories/GHSA-h75v-3vvj-5mfj 2024-05-08 17:42:06 +01:00
Pedro Algarvio
9c56daac01 Bump to `werkzeug==3.0.3` due to https://github.com/advisories/GHSA-2g68-c3qc-8985 2024-05-08 17:42:06 +01:00
Pedro Algarvio
69f01a79ea
Merge 3006.x into 3007.x 2024-04-22 17:16:07 +01:00
Pedro Algarvio
53990e2944 Bump to aiohttp==3.9.4 due to https://github.com/advisories/GHSA-7gpw-8wmc-pm8g 2024-04-22 12:38:20 +01:00
Pedro Algarvio
012d1fd205 Bump to idna==3.7 due to https://github.com/advisories/GHSA-jjg7-2v4v-x38h 2024-04-16 19:14:58 +01:00
Pedro Algarvio
3dcf24c76d Bump to dnspython==2.6.1 due to https://github.com/advisories/GHSA-3rq5-2g8h-59hc 2024-04-16 19:14:58 +01:00
Pedro Algarvio
159cd565c4 Bump to salparse==0.5.0 due to https://github.com/advisories/GHSA-2m57-hf25-phgg 2024-04-16 19:14:58 +01:00
Pedro Algarvio
bfacdbf98f Upgrade to `pytest-salt-factories==1.0.1` 2024-04-04 14:31:11 +01:00
Pedro Algarvio
f38c6bcbf7
Upgrade to `pytest-salt-factories==1.0.1` 2024-04-03 14:42:54 +01:00
Pedro Algarvio
ccfd8ea364 Upgrade to `pytest-salt-factories==1.0.0` 2024-03-21 21:15:17 +00:00
Pedro Algarvio
212e7211c6
Upgrade to `pytest-salt-factories==1.0.0` 2024-03-21 16:34:57 +00:00
Pedro Algarvio
f7570047bd
Merge 3006.x into 3007.x 2024-03-14 13:06:00 +00:00
Pedro Algarvio
5bced402fb Upgrade to flaky==3.8.1 2024-03-14 12:32:06 +00:00
Pedro Algarvio
8fc4738ead Upgrade to Pytest 8.1.x 2024-03-14 12:32:06 +00:00
Pedro Algarvio
6952f883bd Bump to pytest-timeout==2.3.1 2024-03-09 22:26:17 +00:00
Pedro Algarvio
7e1ac8dd5a Add textfsm to our requirements so that tests depending on it actually run 2024-03-06 15:19:54 +00:00
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
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