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

140 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
784dea3884 Restored support for Python 3.9 to test if build now completes successfully 2025-02-20 14:40:58 -07:00
David Murphy
17d2ceb2e8 Removing support for Python 3.7, 3.8 nd 3.9 from pre-commit 2025-02-20 14:40:58 -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
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
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
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
69f01a79ea
Merge 3006.x into 3007.x 2024-04-22 17:16:07 +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
e71960bdfd
Merge 3006.x into 3007.x 2024-03-14 16:26:20 +00:00
Pedro Algarvio
009c059b26 Bump to pygments==2.17.2 due to https://github.com/advisories/GHSA-mrwq-x4v8-fh7p 2024-03-14 16:16:19 +00:00
Pedro Algarvio
4de6b1011f
Merge 3006.x into 3007.x 2024-02-07 11:09:05 +00: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
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
a420d94431
Merge 3006.x into master 2023-11-26 16:10:40 +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
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
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
16dce0b4cc
Merge v3006.4 into 3006.x 2023-10-29 09:24:34 +00:00
Megan Wilhite
d7b8fdf9d7 Bump urllib3 to 1.26.17 or 2.0.6 2023-10-09 13:22:08 +00:00
Pedro Algarvio
6dff22e227 Properly constraint CI requirements from PKG requirements 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-09-29 16:12:59 +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
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
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
David Murphy
244f4a7dad Updat4ed immutables==0.15 where applicable as per reviewer comments 2023-07-28 18:24:59 +01:00
David Murphy
497b9b117d Remove debig log statements and update immutables version used 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
fcfe059402 Updating test requirements for saltcheck junit output 2023-06-09 19:12:03 +00:00
Pedro Algarvio
180ece842c No need to include the base and zeromq dependencies in docs dependencies now. 
Given we now properly constraint requirements files

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
 2023-06-07 22:28:15 +01:00