Stop importing salt in tools/

Signed-off-by: Pedro Algarvio <[email protected]>
jynolen · Dec 7, 2023 · 0401d58 · 0401d58
1 parent 2d0c2e0
commit 0401d58
Show file tree

Hide file tree

Showing 13 changed files with 76 additions and 170 deletions.
diff --git 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.4
     # 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
diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt
@@ -15,68 +15,44 @@ botocore==1.29.152
     #   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.4
-    # 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==3.0.0
     # via rich
 markupsafe==2.1.3
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   jinja2
+    # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
 packaging==23.1
-    # 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.15.1
     # via rich
 python-dateutil==2.8.2
-    # 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.4.2
     # 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.8.0
-    # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
-    #   python-tools-scripts
+    # via python-tools-scripts
 urllib3==1.26.18
     # via
-    #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   botocore
     #   requests
diff --git 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.4
     # 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
diff --git a/requirements/static/ci/py3.11/tools.txt b/requirements/static/ci/py3.11/tools.txt
@@ -15,64 +15,42 @@ botocore==1.29.152
     #   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
 idna==3.4
-    # 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
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
-    # via
-    #   -c requirements/static/ci/../pkg/py3.11/linux.txt
-    #   jinja2
+    # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
 packaging==23.1
-    # 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.15.1
     # via rich
 python-dateutil==2.8.2
-    # 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==13.4.2
     # via python-tools-scripts
 s3transfer==0.6.1
     # 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
diff --git 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.4
     # 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
diff --git a/requirements/static/ci/py3.12/tools.txt b/requirements/static/ci/py3.12/tools.txt
@@ -15,64 +15,42 @@ botocore==1.29.152
     #   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
 idna==3.4
-    # 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
 markdown-it-py==3.0.0
     # via rich
 markupsafe==2.1.3
-    # via
-    #   -c requirements/static/ci/../pkg/py3.12/linux.txt
-    #   jinja2
+    # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
 packaging==23.1
-    # 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.15.1
     # via rich
 python-dateutil==2.8.2
-    # 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==13.4.2
     # via python-tools-scripts
 s3transfer==0.6.1
     # 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
diff --git 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.4
     # 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