From 231b2eaf4c9093bd2dded11d79eaf2d523d7a6903ff7ae2240d7ee75f0a27fcb Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 1 Dec 2023 11:46:38 +0000
Subject: [PATCH] - update to 1.2.4:   * README, test updates   * packaging
 updates - drop compatibility-click-8.patch (upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-click-default-group?expand=0&rev=4
---
 click-default-group-1.2.2.tar.gz   |  3 ---
 click-default-group-1.2.4.tar.gz   |  3 +++
 compatibility-click-8.patch        | 23 -----------------------
 python-click-default-group.changes |  8 ++++++++
 python-click-default-group.spec    | 28 +++++++++++++---------------
 5 files changed, 24 insertions(+), 41 deletions(-)
 delete mode 100644 click-default-group-1.2.2.tar.gz
 create mode 100644 click-default-group-1.2.4.tar.gz
 delete mode 100644 compatibility-click-8.patch

diff --git a/click-default-group-1.2.2.tar.gz b/click-default-group-1.2.2.tar.gz
deleted file mode 100644
index ce5e7dd..0000000
--- a/click-default-group-1.2.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25c6141d87550549b4e27d0661fd543f1deae0dea6e9eeb9e14cbb134610e811
-size 4753
diff --git a/click-default-group-1.2.4.tar.gz b/click-default-group-1.2.4.tar.gz
new file mode 100644
index 0000000..420495b
--- /dev/null
+++ b/click-default-group-1.2.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e89bacc20ca587a8dec53d38beb8ebd193879200a859a7d81923cad7dfd7967
+size 4816
diff --git a/compatibility-click-8.patch b/compatibility-click-8.patch
deleted file mode 100644
index 4b2a969..0000000
--- a/compatibility-click-8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 9415c77d05cf7d16876e7d70a49a41a6189983b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <dev@schuetz-co.de>
-Date: Sun, 20 Jun 2021 16:11:42 +0200
-Subject: [PATCH] make tests compatible with click 8
-
-It now outputs "No such option".
----
- test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test.py b/test.py
-index c464620..f90b80d 100644
---- a/test.py
-+++ b/test.py
-@@ -30,7 +30,7 @@ def bar():
- 
- def test_default_command_with_arguments():
-     assert r.invoke(cli, ['--foo', 'foooo']).output == 'foooo\n'
--    assert 'no such option' in r.invoke(cli, ['-x']).output
-+    assert 'no such option' in r.invoke(cli, ['-x']).output.lower()
- 
- 
- def test_group_arguments():
diff --git a/python-click-default-group.changes b/python-click-default-group.changes
index a9c8012..3de888e 100644
--- a/python-click-default-group.changes
+++ b/python-click-default-group.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Dec  1 11:46:01 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.2.4:
+  * README, test updates
+  * packaging updates
+- drop compatibility-click-8.patch (upstream)
+
 -------------------------------------------------------------------
 Wed Aug 11 10:57:36 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-click-default-group.spec b/python-click-default-group.spec
index 87fe023..1566ece 100644
--- a/python-click-default-group.spec
+++ b/python-click-default-group.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-click-default-group
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,28 +16,26 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%{?sle15_python_module_pythons}
 Name:           python-click-default-group
-Version:        1.2.2
+Version:        1.2.4
 Release:        0
-License:        BSD-3-Clause
 Summary:        Extends clickGroup to invoke a command without explicit subcommand name
-URL:            https://github.com/sublee/click-default-group/
+License:        BSD-3-Clause
 Group:          Development/Languages/Python
+URL:            https://github.com/sublee/click-default-group/
 Source:         https://github.com/click-contrib/click-default-group/archive/v%{version}.tar.gz#/click-default-group-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM compatibility-click-8.patch gh#click-contrib/click-default-group#18 mcepl@suse.com
-# Make tests compatible with click 8
-Patch0:         compatibility-click-8.patch
-BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module flit-core}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module wheel}
+BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-click
+BuildArch:      noarch
 # SECTION test requirements
 BuildRequires:  %{python_module click}
 BuildRequires:  %{python_module pytest}
 # /SECTION
-BuildRequires:  fdupes
-Requires:       python-click
-BuildArch:      noarch
-
 %python_subpackages
 
 %description
@@ -47,10 +45,10 @@ Extends click.Group to invoke a command without explicit subcommand name.
 %autosetup -p1 -n click-default-group-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check