diff --git a/.packit.yaml b/.packit.yaml index 92de121..620e2df 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: @@ -22,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/.pre-commit-config.yaml b/.pre-commit-config.yaml index ac07232..bf9b31b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,3 +34,10 @@ 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 + +ci: + autoupdate_schedule: monthly 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/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.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 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)