Commit graph

173 commits

Author SHA1 Message Date
Daniel A. Wozniak
c5b39473ed Merge branch '3007.x' 2025-03-08 00:19:10 -07:00
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
Daniel A. Wozniak
a017805680 Merge remote-tracking branch 'saltstack/3007.x' into merge/master/3007.x 2025-02-17 00:09: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
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
Daniel A. Wozniak
66e5b97785 Add python 3.13 requirements files 2024-10-23 16:20:51 -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
bdrx312
221420cd57 Use importlib.metadata for python >= 3.10
Add slots to DependencyGraph

Pinned networkx to 3.1

Pinned networkx to latest version supported on python 3.8 to support running salt-ssh to systems with python 3.8

Fixed assignment of env in support helpers VirtualEnv

Restrict networkx version with contraints instead of in base

Fixed setting context retcode in some places where errors are returned.
Removed unnecessary pylint ignore comment.
Reverted importlib-metadata version bump.

Added networkx to versions report

Actually fixed VirtualEnv env assignment from kwargs
2024-10-10 01:53:52 -07:00
bdrx312
66caa58346 Fix issues with requisites and aggregate
add install of networkx
fix aggregate to properly work with requisites
fix requisite checking to not be exponential
fix pkg aggregate to work when multiple states specify the same package
add some type hints to state.py to make the code easier to follow
fix case of pkg aggregate duplicate package.
2024-10-10 01:53:52 -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
ef2a5a1a25 Fix windows pymssql requirement 2024-07-28 22:30:59 -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
54ebfae38a Remove pymysql from windows core requirements 2024-06-25 22:43:26 -07:00
Daniel A. Wozniak
78c29e1679 Bump pymysql to 1.1.1 2024-06-25 22:43:26 -07:00
Daniel A. Wozniak
3735415fbc Bump requests and docker requirements 2024-06-24 09:37:46 -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
twangboy
2847192460 Add GitPython to Windows packages 2024-03-26 19:45:07 +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
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
5ea370c1fb
Merge 3006.x into 3007.x 2024-01-25 09:47:57 +00:00
Twangboy
02ea8d48da Add xmltodict to Windows requirements 2024-01-24 14:39:38 -07:00
Pedro Algarvio
3448e40847
Merge 3006.x into 3007.x 2024-01-24 15:02:25 +00:00
Pedro Algarvio
c7300429d7
Fix pre-commit config and some requirements which got downgraded
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2024-01-16 12:11:09 +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
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
Daniel A. Wozniak
10b714cf55 Simplify payload unpacking. 2023-12-28 00:29:50 -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
a420d94431
Merge 3006.x into master 2023-11-26 16:10:40 +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