Fix pre-commit

.github/workflows/build-deb-packages.yml

@@ -31,6 +31,21 @@ jobs:
         with:
           path: build-deb-pkg
 
+      - name: Download Onedir Tarball as an Artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: salt-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
+          path: build-deb-pkg/artifacts/
+
+      - name: Download System Dependencies
+        run: |
+          apt update
+          apt install -y python3 python3-venv python3-pip build-essential devscripts debhelper bash-completion git
+
+      - name: List CWD
+        run: |
+          ls -la $(cwd)
+
       - name: Download Release Changes
         uses: actions/download-artifact@v2
         with:
@@ -42,16 +57,6 @@ jobs:
           git apply salt-${{ inputs.salt-version }}.diff
           rm salt-${{ inputs.salt-version }}.diff
 
-      - name: Download Onedir Tarball as an Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: salt-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
-          path: build-deb-pkg/artifacts/
-
-      - name: Download System Dependencies
-        run: |
-          apt update
-          apt install -y python3 python3-venv python3-pip build-essential devscripts debhelper bash-completion
 
       - name: Build Deb
         env:

.github/workflows/build-rpm-packages.yml

@@ -34,23 +34,24 @@ jobs:
         with:
           name: salt-${{ inputs.salt-version }}.diff
 
-      - name: Apply release changes
-        shell: bash
-        run: |
-          git apply salt-${{ inputs.salte-version }}.diff
-          rm salt-${{ inputs.salte-version }}.diff
 
 
+      - name: Download System Dependencies
+        run: |
+          yum -y update
+          yum -y install python3 python3-pip openssl git rpmdevtools rpmlint systemd-units libxcrypt-compat git
+
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
         with:
           name: salt-${{ inputs.salt-version }}-onedir-linux-${{ matrix.arch }}.tar.xz
           path: artifacts/
 
-      - name: Download System Dependencies
+      - name: Apply release changes
+        shell: bash
         run: |
-          yum -y update
-          yum -y install python3 python3-pip openssl git rpmdevtools rpmlint systemd-units libxcrypt-compat
+          git apply salt-${{ inputs.salte-version }}.diff
+          rm salt-${{ inputs.salte-version }}.diff
 
       - name: Build RPM
         env:

tools/__init__.py

@@ -1,10 +1,10 @@
 import logging
 
+import tools.changelog
 import tools.ci
+import tools.docs
 import tools.pkg
 import tools.vm
-import tools.changelog
-import tools.docs
 
 for name in ("boto3", "botocore", "urllib3"):
     logging.getLogger(name).setLevel(logging.INFO)

tools/docs.py

@@ -4,17 +4,11 @@ These commands are used to generate Salt's manpages.
 # pylint: disable=resource-leakage,broad-except
 from __future__ import annotations
 
-import datetime
-import fnmatch
 import logging
 import os
 import pathlib
 import shutil
-import subprocess
-import sys
-import textwrap
 
-import yaml
 from ptscripts import Context, command_group
 
 log = logging.getLogger(__name__)
@@ -24,6 +18,7 @@ REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent
 # Define the command group
 doc = command_group(name="docs", help="Manpages tools", description=__doc__)
 
+
 @doc.command(
     name="man",
 )
@@ -54,7 +49,7 @@ def epub(ctx: Context):
 @doc.command(
     name="pdf",
 )
-def html(ctx: Context):
+def pdf(ctx: Context):
     if not shutil.which("inkscape"):
         ctx.warn("No inkscape binary found")
         ctx.exit(1)

tools/pkg.py

@@ -5,17 +5,16 @@ These commands are used to build Salt packages.
 from __future__ import annotations
 
 import fnmatch
+import gzip
 import hashlib
 import json
 import logging
-import gzip
 import os
 import pathlib
-import tempfile
-import tarfile
 import shutil
-import subprocess
 import sys
+import tarfile
+import tempfile
 
 import yaml
 from ptscripts import Context, command_group
@@ -317,5 +316,5 @@ def source_tarball(ctx: Context):
             str(pkg.relative_to(REPO_ROOT))
             for pkg in REPO_ROOT.joinpath("dist").iterdir()
         ]
-        ctx.run("sha256sum", *packages) #, external=True)
+        ctx.run("sha256sum", *packages)
     ctx.run("python3", "-m", "twine", "check", "dist/*", check=True)