Stop importing salt in tools/

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
2025-04-17 10:10:20 +00:00 · 2023-12-07 17:00:04 +00:00 · 2023-12-07 17:00:04 +00:00 · 3f74d428e1
commit 3f74d428e1
parent e7b7cf2272
13 changed files with 74 additions and 164 deletions
--- a/requirements/static/ci/py3.10/tools-virustotal.txt
+++ b/requirements/static/ci/py3.10/tools-virustotal.txt
@ -6,23 +6,23 @@
 #
 certifi==2023.7.22
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -c requirements/static/ci/../ci/py3.10/tools.txt
    #   requests
 charset-normalizer==3.2.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -c requirements/static/ci/../ci/py3.10/tools.txt
    #   requests
 idna==3.2
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -c requirements/static/ci/../ci/py3.10/tools.txt
    #   requests
 requests==2.31.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -c requirements/static/ci/../ci/py3.10/tools.txt
    #   virustotal3
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
+    #   -c requirements/static/ci/../ci/py3.10/tools.txt
    #   requests
 virustotal3==1.0.8
    # via -r requirements/static/ci/tools-virustotal.in
--- a/requirements/static/ci/py3.10/tools.txt
+++ b/requirements/static/ci/py3.10/tools.txt
@ -15,66 +15,44 @@ botocore==1.29.147
    #   boto3
    #   s3transfer
 certifi==2023.7.22
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   requests
+    # via requests
 charset-normalizer==3.2.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   requests
+    # via requests
 idna==3.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   requests
+    # via requests
 jinja2==3.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 jmespath==1.0.1
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
    #   boto3
    #   botocore
 markdown-it-py==2.2.0
    # via rich
 markupsafe==2.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   jinja2
+    # via jinja2
 mdurl==0.1.2
    # via markdown-it-py
 packaging==22.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 pygments==2.13.0
    # via rich
 python-dateutil==2.8.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   botocore
+    # via botocore
 python-tools-scripts==0.18.6
    # via -r requirements/static/ci/tools.in
 pyyaml==6.0.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 requests==2.31.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   python-tools-scripts
+    # via python-tools-scripts
 rich==13.3.5
    # via python-tools-scripts
 s3transfer==0.6.1
    # via boto3
 six==1.16.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   python-dateutil
+    # via python-dateutil
 typing-extensions==4.2.0
    # via python-tools-scripts
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
    #   botocore
    #   requests
--- a/requirements/static/ci/py3.11/tools-virustotal.txt
+++ b/requirements/static/ci/py3.11/tools-virustotal.txt
@ -6,23 +6,23 @@
 #
 certifi==2023.7.22
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -c requirements/static/ci/../ci/py3.11/tools.txt
    #   requests
 charset-normalizer==3.2.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -c requirements/static/ci/../ci/py3.11/tools.txt
    #   requests
 idna==3.2
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -c requirements/static/ci/../ci/py3.11/tools.txt
    #   requests
 requests==2.31.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -c requirements/static/ci/../ci/py3.11/tools.txt
    #   virustotal3
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
+    #   -c requirements/static/ci/../ci/py3.11/tools.txt
    #   requests
 virustotal3==1.0.8
    # via -r requirements/static/ci/tools-virustotal.in
--- a/requirements/static/ci/py3.11/tools.txt
+++ b/requirements/static/ci/py3.11/tools.txt
@ -15,62 +15,40 @@ botocore==1.24.46
    #   boto3
    #   s3transfer
 certifi==2023.07.22
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   requests
+    # via requests
 charset-normalizer==3.2.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   requests
+    # via requests
 commonmark==0.9.1
    # via rich
 idna==3.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   requests
+    # via requests
 jinja2==3.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 jmespath==1.0.1
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
    #   boto3
    #   botocore
 markupsafe==2.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   jinja2
+    # via jinja2
 packaging==22.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 pygments==2.13.0
    # via rich
 python-dateutil==2.8.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   botocore
+    # via botocore
 python-tools-scripts==0.18.6
    # via -r requirements/static/ci/tools.in
 pyyaml==6.0.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 requests==2.31.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   python-tools-scripts
+    # via python-tools-scripts
 rich==12.5.1
    # via python-tools-scripts
 s3transfer==0.5.2
    # via boto3
 six==1.16.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   python-dateutil
+    # via python-dateutil
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
    #   botocore
    #   requests
--- a/requirements/static/ci/py3.12/tools-virustotal.txt
+++ b/requirements/static/ci/py3.12/tools-virustotal.txt
@ -6,23 +6,23 @@
 #
 certifi==2023.7.22
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
+    #   -c requirements/static/ci/../ci/py3.12/tools.txt
    #   requests
 charset-normalizer==3.2.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
+    #   -c requirements/static/ci/../ci/py3.12/tools.txt
    #   requests
 idna==3.2
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
+    #   -c requirements/static/ci/../ci/py3.12/tools.txt
    #   requests
 requests==2.31.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
+    #   -c requirements/static/ci/../ci/py3.12/tools.txt
    #   virustotal3
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
+    #   -c requirements/static/ci/../ci/py3.12/tools.txt
    #   requests
 virustotal3==1.0.8
    # via -r requirements/static/ci/tools-virustotal.in
--- a/requirements/static/ci/py3.12/tools.txt
+++ b/requirements/static/ci/py3.12/tools.txt
@ -15,62 +15,40 @@ botocore==1.24.46
    #   boto3
    #   s3transfer
 certifi==2023.07.22
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   requests
+    # via requests
 charset-normalizer==3.2.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   requests
+    # via requests
 commonmark==0.9.1
    # via rich
 idna==3.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   requests
+    # via requests
 jinja2==3.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 jmespath==1.0.1
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
    #   boto3
    #   botocore
 markupsafe==2.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   jinja2
+    # via jinja2
 packaging==22.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 pygments==2.13.0
    # via rich
 python-dateutil==2.8.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   botocore
+    # via botocore
 python-tools-scripts==0.18.6
    # via -r requirements/static/ci/tools.in
 pyyaml==6.0.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 requests==2.31.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   python-tools-scripts
+    # via python-tools-scripts
 rich==12.5.1
    # via python-tools-scripts
 s3transfer==0.5.2
    # via boto3
 six==1.16.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   python-dateutil
+    # via python-dateutil
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
    #   botocore
    #   requests
--- a/requirements/static/ci/py3.9/tools-virustotal.txt
+++ b/requirements/static/ci/py3.9/tools-virustotal.txt
@ -6,23 +6,23 @@
 #
 certifi==2023.7.22
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -c requirements/static/ci/../ci/py3.9/tools.txt
    #   requests
 charset-normalizer==3.2.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -c requirements/static/ci/../ci/py3.9/tools.txt
    #   requests
 idna==3.2
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -c requirements/static/ci/../ci/py3.9/tools.txt
    #   requests
 requests==2.31.0
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -c requirements/static/ci/../ci/py3.9/tools.txt
    #   virustotal3
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
+    #   -c requirements/static/ci/../ci/py3.9/tools.txt
    #   requests
 virustotal3==1.0.8
    # via -r requirements/static/ci/tools-virustotal.in
--- a/requirements/static/ci/py3.9/tools.txt
+++ b/requirements/static/ci/py3.9/tools.txt
@ -15,66 +15,44 @@ botocore==1.29.147
    #   boto3
    #   s3transfer
 certifi==2023.7.22
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   requests
+    # via requests
 charset-normalizer==3.2.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   requests
+    # via requests
 idna==3.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   requests
+    # via requests
 jinja2==3.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 jmespath==1.0.1
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
    #   boto3
    #   botocore
 markdown-it-py==2.2.0
    # via rich
 markupsafe==2.1.2
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   jinja2
+    # via jinja2
 mdurl==0.1.2
    # via markdown-it-py
 packaging==22.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 pygments==2.13.0
    # via rich
 python-dateutil==2.8.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   botocore
+    # via botocore
 python-tools-scripts==0.18.6
    # via -r requirements/static/ci/tools.in
 pyyaml==6.0.1
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   -r requirements/static/ci/tools.in
+    # via -r requirements/static/ci/tools.in
 requests==2.31.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   python-tools-scripts
+    # via python-tools-scripts
 rich==13.3.5
    # via python-tools-scripts
 s3transfer==0.6.1
    # via boto3
 six==1.16.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
-    #   python-dateutil
+    # via python-dateutil
 typing-extensions==4.2.0
    # via python-tools-scripts
 urllib3==1.26.18
    # via
-    #   -c requirements/static/ci/../pkg/py3.9/linux.txt
    #   botocore
    #   requests
--- a/requirements/static/ci/tools-virustotal.in
+++ b/requirements/static/ci/tools-virustotal.in
@ -1,3 +1,3 @@
--constraint=../pkg/py{py_version}/{platform}.txt
+--constraint=../ci/py{py_version}/tools.txt

 virustotal3
--- a/requirements/static/ci/tools.in
+++ b/requirements/static/ci/tools.in
@ -1,5 +1,3 @@
--constraint=../pkg/py{py_version}/{platform}.txt
-
 attrs
 python-tools-scripts >= 0.18.6
 boto3
--- a/salt/version.py
+++ b/salt/version.py
@ -927,6 +927,7 @@ def _parser():
    parser.add_argument(
        "--next-release", help="Return the next release", action="store_true"
    )
+    parser.add_argument("--parse", help="Parse the passed string as a salt version")
    # When pip installing we pass in other args to this script.
    # This allows us to catch those args but not use them
    parser.add_argument("unknown", nargs=argparse.REMAINDER)
@ -937,5 +938,11 @@ if __name__ == "__main__":
    args = _parser()
    if args.next_release:
        print(__saltstack_version__.next_release())
+    elif args.parse:
+        try:
+            print(SaltStackVersion.parse(args.parse))
+        except Exception as exc:  # pylint: disable=broad-except
+            print(f"Failed to parse '{args.parse}' as a salt version: {exc}")
+            sys.exit(1)
    else:
        print(__version__)
--- a/tools/init.py
+++ b/tools/init.py
@ -12,26 +12,17 @@ STATIC_REQUIREMENTS_PATH = REQUIREMENTS_FILES_PATH / "static"
 CI_REQUIREMENTS_FILES_PATH = (
    STATIC_REQUIREMENTS_PATH / "ci" / "py{}.{}".format(*sys.version_info)
 )
-PKG_REQUIREMENTS_FILES_PATH = (
-    STATIC_REQUIREMENTS_PATH / "pkg" / "py{}.{}".format(*sys.version_info)
-)
 DEFAULT_REQS_CONFIG = DefaultRequirementsConfig(
    pip_args=[
        f"--constraint={REQUIREMENTS_FILES_PATH / 'constraints.txt'}",
-        f"--constraint={PKG_REQUIREMENTS_FILES_PATH / 'linux.txt'}",
    ],
    requirements_files=[
-        REQUIREMENTS_FILES_PATH / "base.txt",
        CI_REQUIREMENTS_FILES_PATH / "tools.txt",
    ],
 )
 RELEASE_VENV_CONFIG = VirtualEnvConfig(
-    env={
-        "PIP_CONSTRAINT": str(REQUIREMENTS_FILES_PATH / "constraints.txt"),
-    },
    pip_args=[
        f"--constraint={REQUIREMENTS_FILES_PATH / 'constraints.txt'}",
-        f"--constraint={PKG_REQUIREMENTS_FILES_PATH / 'linux.txt'}",
    ],
    requirements_files=[
        CI_REQUIREMENTS_FILES_PATH / "tools-virustotal.txt",
--- a/tools/precommit/docstrings.py
+++ b/tools/precommit/docstrings.py
@ -10,12 +10,13 @@ import ast
 import os
 import pathlib
 import re
+import subprocess
+import sys
 from typing import TYPE_CHECKING

 from ptscripts import Context, command_group

 import tools.utils
-from salt.version import SaltStackVersion
 from tools.precommit import SALT_INTERNAL_LOADERS_PATHS

 SALT_CODE_DIR = tools.utils.REPO_ROOT / "salt"
@ -1088,9 +1089,10 @@ def _check_valid_versions_on_docstrings(docstring):
        versions = [vs.strip() for vs in version.split(",")]
        bad_versions = []
        for vs in versions:
-            try:
-                SaltStackVersion.parse(vs)
-            except ValueError:
+            ret = subprocess.run(
+                [sys.executable, str(SALT_CODE_DIR / "version.py"), vs], check=False
+            )
+            if ret.returncode:
                bad_versions.append(vs)
        if bad_versions:
            return vtype, ", ".join(bad_versions)