From 7e3a21c45a37a1041d0e22118ba5f6f14373632d Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 14 Sep 2023 11:49:50 +0200 Subject: [PATCH 1/5] Don't sync plans/ downstream There already is a sanity plans/ in dist-git --- .packit.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 92de121..263cb27 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,10 +5,6 @@ upstream_project_url: https://github.com/fedora-ci/rpmdeplint files_to_sync: - rpmdeplint.spec - .packit.yaml - - src: plans/ - dest: plans/ - - src: .fmf/ - dest: .fmf/ actions: create-archive: From eb1f7b49aaa7fdc282820fe9e60c3b9bd0378e34 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 14 Sep 2023 14:11:12 +0200 Subject: [PATCH 2/5] Run 'packit validate-config' in pre-commit --- .pre-commit-config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac07232..5120818 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,3 +34,7 @@ repos: - id: mypy additional_dependencies: [types-requests, types-six] exclude: docs/conf.py + - repo: https://github.com/packit/pre-commit-hooks + rev: v1.2.0 + hooks: + - id: validate-config From 017cc4d464ef6cb8e38b32851dbb933c626ee026 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Thu, 14 Sep 2023 17:15:49 +0200 Subject: [PATCH 3/5] Fix rpmdeplint --help --- plans/smoke.fmf | 19 ++++++++++++++++--- rpmdeplint/cli.py | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/plans/smoke.fmf b/plans/smoke.fmf index 8283bf8..d671b5e 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,5 +1,18 @@ summary: - Basic smoke test + Basic tests + +discover: + how: shell + tests: + + - name: /sanity/import + test: python3 -c "import rpmdeplint" + + - name: /sanity/help + test: rpmdeplint --help + + - name: /sanity/version + test: rpmdeplint --version | grep -P "^rpmdeplint \d+\.\d+" + execute: - script: - - python3 -c "import rpmdeplint" + how: tmt diff --git a/rpmdeplint/cli.py b/rpmdeplint/cli.py index 8bd7563..3b6d1bc 100644 --- a/rpmdeplint/cli.py +++ b/rpmdeplint/cli.py @@ -199,7 +199,7 @@ def add_subparser( subcommand: str, _help: str, subcommand_func: Callable[..., ExitCode] ): parser_check = subparsers.add_parser( - subcommand, help=help, description=subcommand_func.__doc__ + subcommand, help=_help, description=subcommand_func.__doc__ ) add_common_dependency_analyzer_args(parser_check) parser_check.set_defaults(func=subcommand_func) From f6bc73d33ff6dcd1ef0e3824fa24b880f84a34f8 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Fri, 15 Sep 2023 09:58:39 +0200 Subject: [PATCH 4/5] Autoupdate pre-commit config montly, not weekly (default) --- .pre-commit-config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5120818..bf9b31b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,3 +38,6 @@ repos: rev: v1.2.0 hooks: - id: validate-config + +ci: + autoupdate_schedule: monthly From 31de640ad76555aec2149f4f51bb994b0ab75f54 Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Fri, 15 Sep 2023 13:56:56 +0200 Subject: [PATCH 5/5] Re-tag 1.5 to 2.0rc1 Before I started adding commits to this project, I created a rpmdeplint-1.5 tag because the previous was rpmdeplint-1.4. After I released 1.6 I found out that there's a problem which looks like https://bugzilla.redhat.com/show_bug.cgi?id=1343247#c18 and I realized that the next release after 1.4 was supposed to be 2.0, not 1.5 probably because of the - hawkey to libsolv move (36fc40c3 and others) - repodata caching/reusing (6f11c370 and others) - rearrange conflict checking algorithm (5c07a05d) So I retroactively replaced rpmdeplint-1.5 with v2.0rc1 and rpmdeplint-1.6 with v2.0rc2. Next tag will be 2.0rc3 --- .packit.yaml | 2 +- docs/CHANGES.rst | 9 +++++---- rpmdeplint.spec | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index 263cb27..620e2df 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -18,7 +18,7 @@ srpm_build_deps: - hatch - python3-hatch-vcs -upstream_tag_template: rpmdeplint-{version} +upstream_tag_template: v{version} jobs: - job: copr_build diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst index 05834a8..81d4333 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -1,8 +1,9 @@ Changelog --------- -1.6 -~~~ +2.0rc2 +~~~~~~ + * Easier development/maintaining: * `pre-commit `__ * Use `Packit `__ to: @@ -23,8 +24,8 @@ Changelog Run ``'make -C docs man'`` to build it (`related to RHBZ#2221957 `__). -1.5 -~~~ +2.0rc1 +~~~~~~ * Added yum repository caching which performs regular cleans for files more than one week old. This expiry period can be modified with the environment variable ``RPMDEPLINT_EXPIRY_SECONDS``. diff --git a/rpmdeplint.spec b/rpmdeplint.spec index d34c211..697a52a 100644 --- a/rpmdeplint.spec +++ b/rpmdeplint.spec @@ -1,5 +1,5 @@ Name: rpmdeplint -Version: 1.6 +Version: 2.0 Release: %autorelease Summary: Tool to find errors in RPM packages in the context of their dependency graph License: GPL-2.0-or-later