Commit graph

85 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
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
bbd061b47b Forcing rebuild 2024-10-24 08:57:52 -07:00
David Murphy
a8a73c40f5 Revert psutil dependency back to greater than 5.0.0 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
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
dmurphy18
d1d84e87b3 Removed comment line and removed typo 2024-06-19 11:23:50 -07:00
David Murphy
ae459fa73a Update to include croniter in pkg requirements 2024-06-19 11:23:50 -07:00
twangboy
2847192460 Add GitPython to Windows packages 2024-03-26 19:45:07 +00:00
Pedro Algarvio
5840ab68a5 We depend on `msgpack >= 1.0`, simplify logic 2024-02-27 08:07:04 +00:00
Pedro Algarvio
4de6b1011f
Merge 3006.x into 3007.x 2024-02-07 11:09:05 +00:00
Pedro Algarvio
5ea370c1fb
Merge 3006.x into 3007.x 2024-01-25 09:47:57 +00:00
Daniel A. Wozniak
10b714cf55 Simplify payload unpacking. 2023-12-28 00:29:50 -07:00
Pedro Algarvio
5a8607c2e7 Create and use requirements/constraints.txt now that setuptools 69.0 broke builds again
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-27 21:13:22 +00:00
Pedro Algarvio
54ba9dcd70
Create and use requirements/constraints.txt now that setuptools 69.0 broke builds again
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-11-26 16:59:14 +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
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
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
Daniel A. Wozniak
ca93da0d7d Fix up issues found in code review 2023-08-08 14:47:15 -07:00
Daniel A. Wozniak
a951a88576 Bump msgpack minimum version 2023-08-08 14:47:15 -07: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
b88f6f1800 Properly constrain CI requirements
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-06-07 22:28:15 +01:00
Daniel A. Wozniak
063bf2959e Do not conflict versoins for setup.py 2023-05-31 15:59:57 -07:00
Daniel A. Wozniak
3239877c78 Bump tornado to the newest version 6.3.2 2023-05-31 15:59:57 -07:00
Daniel A. Wozniak
166c07f6da Get rid of RequestContext 2023-05-23 14:41:30 -07:00
Daniel A. Wozniak
79f240c2e9 Tornado 6.1 2023-05-23 14:41:30 -07:00
Pedro Algarvio
4ecfd3d3d5 Use packaging for version parsing. looseversion when needed only.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2023-01-09 12:31:51 -07:00
David Murphy
75b1be30a6 Further cleanup, removed used of looseversion and packaging 2022-12-20 07:07:21 -07:00
David Murphy
e8441238e1 Initial removal usage of distutils and replacement with setuptools 2022-12-20 07:07:21 -07:00
Twangboy
87ac8341e5 Add comment to base.txt that we need contextvars 2022-11-15 13:37:56 -07:00
Gareth J. Greenaway
20fb0beb38 package jmespath 2022-09-12 12:13:00 -07:00
Wayne Werner
b0450ce6ac remove erroneous empty line 2022-04-07 15:52:57 -04:00
Wayne Werner
f4e12fc7ba Updating msgpack version for windows
Before it was pinned to an out of date buggy version, this should fix
some errors and inconsistencies.
2022-04-07 15:52:57 -04:00
cmcmarrow
86d7c2dd05 fix pre 2021-09-24 20:20:32 -07:00
cmcmarrow
d4c283925f run pre 2021-09-24 20:20:32 -07:00