From 4270c816c44a641fd593083bc306ad654d08f312 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 7 Feb 2023 11:37:08 +0000 Subject: [PATCH] Make `pkg-repo` a `repo` sub-command for `pkg` Signed-off-by: Pedro Algarvio --- .github/workflows/build-deb-repo.yml | 2 +- .github/workflows/build-macos-repo.yml | 2 +- .github/workflows/build-onedir-repo.yml | 2 +- .github/workflows/build-rpm-repo.yml | 2 +- .github/workflows/build-windows-repo.yml | 2 +- .pre-commit-config.yaml | 2 +- requirements/static/ci/py3.10/tools.txt | 2 +- requirements/static/ci/py3.9/tools.txt | 2 +- requirements/static/ci/tools.in | 2 +- tools/changelog.py | 10 +++++----- tools/pkgrepo.py | 23 ++++++++++++++++------- 11 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-deb-repo.yml b/.github/workflows/build-deb-repo.yml index 53792ec820a..2b01a199260 100644 --- a/.github/workflows/build-deb-repo.yml +++ b/.github/workflows/build-deb-repo.yml @@ -126,7 +126,7 @@ jobs: - name: Create Repository run: | - tools pkg-repo deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ + tools pkg repo create deb --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} --distro-version=${{ matrix.version }} \ --incoming=artifacts/pkgs/incoming --repo-path=artifacts/pkgs/repo diff --git a/.github/workflows/build-macos-repo.yml b/.github/workflows/build-macos-repo.yml index 06d9fa4d912..47dec8c2b2b 100644 --- a/.github/workflows/build-macos-repo.yml +++ b/.github/workflows/build-macos-repo.yml @@ -89,7 +89,7 @@ jobs: - name: Create Repository run: | - tools pkg-repo macos --key-id=64CBBC8173D76B3F \ + tools pkg repo create macos --key-id=64CBBC8173D76B3F \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ --repo-path=artifacts/pkgs/repo diff --git a/.github/workflows/build-onedir-repo.yml b/.github/workflows/build-onedir-repo.yml index 5a8d5beb23b..683e694b390 100644 --- a/.github/workflows/build-onedir-repo.yml +++ b/.github/workflows/build-onedir-repo.yml @@ -131,7 +131,7 @@ jobs: - name: Create Repository run: | - tools pkg-repo onedir --key-id=64CBBC8173D76B3F \ + tools pkg repo create onedir --key-id=64CBBC8173D76B3F \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ --repo-path=artifacts/pkgs/repo diff --git a/.github/workflows/build-rpm-repo.yml b/.github/workflows/build-rpm-repo.yml index fae63211e0d..4f22ca72009 100644 --- a/.github/workflows/build-rpm-repo.yml +++ b/.github/workflows/build-rpm-repo.yml @@ -111,7 +111,7 @@ jobs: - name: Create Repository run: | - tools pkg-repo rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ + tools pkg repo create rpm --key-id=64CBBC8173D76B3F --distro-arch=${{ matrix.arch }} \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --distro=${{ matrix.distro }} \ --distro-version=${{ matrix.version }} \ diff --git a/.github/workflows/build-windows-repo.yml b/.github/workflows/build-windows-repo.yml index a6cb6aa0fb9..5dbefb968fd 100644 --- a/.github/workflows/build-windows-repo.yml +++ b/.github/workflows/build-windows-repo.yml @@ -95,7 +95,7 @@ jobs: - name: Create Repository run: | - tools pkg-repo windows --key-id=64CBBC8173D76B3F \ + tools pkg repo create windows --key-id=64CBBC8173D76B3F \ ${{ inputs.nightly-build && '--nightly-build' || '' }} --salt-version=${{ inputs.salt-version }} \ ${{ inputs.rc-build && '--rc-build' || '' }} --incoming=artifacts/pkgs/incoming \ --repo-path=artifacts/pkgs/repo diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bef60a29890..f6e53339ad1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: )$ - repo: https://github.com/s0undt3ch/python-tools-scripts - rev: "0.10.1" + rev: "0.10.2" hooks: - id: tools alias: generate-workflows diff --git a/requirements/static/ci/py3.10/tools.txt b/requirements/static/ci/py3.10/tools.txt index 0dd56ccebbd..c491a42122d 100644 --- a/requirements/static/ci/py3.10/tools.txt +++ b/requirements/static/ci/py3.10/tools.txt @@ -30,7 +30,7 @@ pygments==2.13.0 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.10.1 +python-tools-scripts==0.10.2 # via -r requirements/static/ci/tools.in pyyaml==6.0 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/py3.9/tools.txt b/requirements/static/ci/py3.9/tools.txt index 960a777ba78..4b5151952d2 100644 --- a/requirements/static/ci/py3.9/tools.txt +++ b/requirements/static/ci/py3.9/tools.txt @@ -30,7 +30,7 @@ pygments==2.13.0 # via rich python-dateutil==2.8.2 # via botocore -python-tools-scripts==0.10.1 +python-tools-scripts==0.10.2 # via -r requirements/static/ci/tools.in pyyaml==6.0 # via -r requirements/static/ci/tools.in diff --git a/requirements/static/ci/tools.in b/requirements/static/ci/tools.in index e386abcfcd7..e3fa06664e5 100644 --- a/requirements/static/ci/tools.in +++ b/requirements/static/ci/tools.in @@ -1,4 +1,4 @@ -python-tools-scripts >= 0.10.1 +python-tools-scripts >= 0.10.2 attrs boto3 pyyaml diff --git a/tools/changelog.py b/tools/changelog.py index 559195d6c61..1df867bd61c 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -19,7 +19,7 @@ log = logging.getLogger(__name__) REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent # Define the command group -cl = command_group( +changelog = command_group( name="changelog", help="Changelog tools", description=__doc__, @@ -118,7 +118,7 @@ def _get_salt_version(): ) -@cl.command( +@changelog.command( name="update-rpm", arguments={ "salt_version": { @@ -168,7 +168,7 @@ def update_rpm(ctx: Context, salt_version: str, draft: bool = False): os.remove(tmpspec) -@cl.command( +@changelog.command( name="update-deb", arguments={ "salt_version": { @@ -211,7 +211,7 @@ def update_deb(ctx: Context, salt_version: str, draft: bool = False): os.remove(tmpchanges) -@cl.command( +@changelog.command( name="update-release-notes", arguments={ "salt_version": { @@ -257,7 +257,7 @@ def update_release_notes(ctx: Context, salt_version: str, draft: bool = False): os.remove(tmpnotes) -@cl.command( +@changelog.command( name="update-changelog-md", arguments={ "salt_version": { diff --git a/tools/pkgrepo.py b/tools/pkgrepo.py index 9a00a849f47..120dd044285 100644 --- a/tools/pkgrepo.py +++ b/tools/pkgrepo.py @@ -16,17 +16,26 @@ from typing import TYPE_CHECKING import packaging.version from ptscripts import Context, command_group +import tools.pkg + log = logging.getLogger(__name__) REPO_ROOT = pathlib.Path(__file__).resolve().parent.parent # Define the command group -pkg = command_group( - name="pkg-repo", help="Packaging Repository Related Commands", description=__doc__ +repo = command_group( + name="repo", + help="Packaging Repository Related Commands", + description=__doc__, + parent=tools.pkg.pkg, +) + +create = command_group( + name="create", help="Packaging Repository Creation Related Commands", parent=repo ) -@pkg.command( +@create.command( name="deb", arguments={ "salt_version": { @@ -290,7 +299,7 @@ def debian( ctx.info("Done") -@pkg.command( +@create.command( name="rpm", arguments={ "salt_version": { @@ -503,7 +512,7 @@ def rpm( ctx.info("Done") -@pkg.command( +@create.command( name="windows", arguments={ "salt_version": { @@ -564,7 +573,7 @@ def windows( ctx.info("Done") -@pkg.command( +@create.command( name="macos", arguments={ "salt_version": { @@ -625,7 +634,7 @@ def macos( ctx.info("Done") -@pkg.command( +@create.command( name="onedir", arguments={ "salt_version": {