Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package bump2version for openSUSE:Factory checked in at 2022-07-14 16:34:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bump2version (Old) and /work/SRC/openSUSE:Factory/.bump2version.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bump2version" Thu Jul 14 16:34:44 2022 rev:5 rq:989188 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/bump2version/bump2version.changes 2021-04-17 23:24:50.533581483 +0200 +++ /work/SRC/openSUSE:Factory/.bump2version.new.1523/bump2version.changes 2022-07-14 16:35:11.996682308 +0200 @@ -1,0 +2,6 @@ +Thu Jul 7 13:53:33 UTC 2022 - Sebastian Wagner <sebix+novell....@sebix.at> + +- add fix-test_usage_string.patch to fix the failing test_usage_string test. +- Skip test_usage_string, fail reported upstream. + +------------------------------------------------------------------- New: ---- fix-test_usage_string.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bump2version.spec ++++++ --- /var/tmp/diff_new_pack.Va31e8/_old 2022-07-14 16:35:12.464682770 +0200 +++ /var/tmp/diff_new_pack.Va31e8/_new 2022-07-14 16:35:12.468682773 +0200 @@ -1,7 +1,7 @@ # # spec file for package bump2version # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ URL: https://github.com/c4urself/bump2version # using GH URL instead of PyPI as the PyPI tarball contains already-prebuilt files Source: %{URL}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-test_usage_string.patch -- fixes test_usage_string +Patch0: https://github.com/c4urself/bump2version/commit/1c4f04b6ab90f6d432b6c4117e0de38b006a5de5.patch#/fix-test_usage_string.patch BuildRequires: %{python_module pytest >= 3.4.0} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testfixtures >= 6.0.0} @@ -51,6 +53,7 @@ %prep %setup -q +%patch0 -p1 %build %python_build @@ -63,7 +66,8 @@ %check # test_usage_string_fork: bumpversion is not in PATH -%pytest -k 'not test_usage_string_fork' +# test_usage_string: https://github.com/c4urself/bump2version/issues/254 +%pytest -k 'not (test_usage_string_fork or test_usage_string)' %post %{python_install_alternative bump2version bumpversion} ++++++ fix-test_usage_string.patch ++++++ >From 1c4f04b6ab90f6d432b6c4117e0de38b006a5de5 Mon Sep 17 00:00:00 2001 From: Nicolas Benes <nbenes...@xandea.de> Date: Fri, 14 Jan 2022 18:43:11 +0100 Subject: [PATCH] Fix expected usage string for tests --- tests/test_cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_cli.py b/tests/test_cli.py index 1589da0..ec5e9e4 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -117,7 +117,7 @@ def _mock_calls_to_string(called_mock): [--tag-message TAG_MESSAGE] [--message COMMIT_MSG] part -[file [file ...]] +[file ...] """.strip().splitlines() EXPECTED_USAGE = (r""" @@ -247,7 +247,7 @@ def test_defaults_in_usage_with_config(tmpdir, capsys): assert "New version that should be in the files (default: 19)" in out assert "[--current-version VERSION]" in out assert "[--new-version VERSION]" in out - assert "[file [file ...]]" in out + assert "[file ...]" in out def test_missing_explicit_config_file(tmpdir):
