From 5e47c674a307c6752dcc03072463b42fdbd8d9d0ca2a32d08ddeda7420880edd Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Wed, 15 May 2024 05:00:48 +0000
Subject: [PATCH] - Update to 0.24.3:   * Tidies and Maintenance fixes - Switch
 to pyproject macros. - No more greedy globs in %files. - Add patch
 support-pytest-8.patch:   * Support pytest 8 changes.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyudev?expand=0&rev=64
---
 python-pyudev-0.24.1-gh.tar.gz |  3 ---
 python-pyudev-0.24.3-gh.tar.gz |  3 +++
 python-pyudev.changes          | 10 ++++++++++
 python-pyudev.spec             | 17 ++++++++++-------
 support-pytest-8.patch         | 29 +++++++++++++++++++++++++++++
 5 files changed, 52 insertions(+), 10 deletions(-)
 delete mode 100644 python-pyudev-0.24.1-gh.tar.gz
 create mode 100644 python-pyudev-0.24.3-gh.tar.gz
 create mode 100644 support-pytest-8.patch

diff --git a/python-pyudev-0.24.1-gh.tar.gz b/python-pyudev-0.24.1-gh.tar.gz
deleted file mode 100644
index 933d68f..0000000
--- a/python-pyudev-0.24.1-gh.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b277149ebca914d3f5daff1a7fa1e0d00bea9c4950af8ac95d9a8a83f2937c79
-size 81689
diff --git a/python-pyudev-0.24.3-gh.tar.gz b/python-pyudev-0.24.3-gh.tar.gz
new file mode 100644
index 0000000..c59b6b3
--- /dev/null
+++ b/python-pyudev-0.24.3-gh.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a4b05b9fb6044bb036eb901c868fd0f3ad1039c290b6e545dd41b51622258c63
+size 80807
diff --git a/python-pyudev.changes b/python-pyudev.changes
index 8d5b038..596905c 100644
--- a/python-pyudev.changes
+++ b/python-pyudev.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed May 15 04:57:43 UTC 2024 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 0.24.3:
+  * Tidies and Maintenance fixes
+- Switch to pyproject macros.
+- No more greedy globs in %files.
+- Add patch support-pytest-8.patch:
+  * Support pytest 8 changes.
+
 -------------------------------------------------------------------
 Mon Oct 30 16:58:20 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
 
diff --git a/python-pyudev.spec b/python-pyudev.spec
index 6634a07..b3b776e 100644
--- a/python-pyudev.spec
+++ b/python-pyudev.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyudev
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,14 +16,12 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %{?sle15_python_module_pythons}
 Name:           python-pyudev
-Version:        0.24.1
+Version:        0.24.3
 Release:        0
 Summary:        Udev bindings for Python
 License:        LGPL-2.1-or-later
-Group:          Development/Libraries/Python
 URL:            https://pyudev.readthedocs.io/
 Source0:        https://github.com/pyudev/pyudev/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}-gh.tar.gz
 # PATCH-FIX-UPSTREAM pytest_register_mark.patch gh#pyudev/pyudev#404 mcepl@suse.com
@@ -32,7 +30,11 @@ Patch0:         pytest_register_mark.patch
 # PATCH-FIX-OPENSUSE hypothesis_settings.patch mcepl@suse.com
 # tests timeout on OBS
 Patch2:         hypothesis_settings.patch
+# PATCH-FIX-UPSTREAM gh#pyudev/pyudev#512
+Patch3:         support-pytest-8.patch
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  pkgconfig
 BuildRequires:  python-rpm-macros
@@ -66,10 +68,10 @@ in modern linux systems.
 sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',\\?||" doc/conf.py
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
@@ -80,6 +82,7 @@ sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',
 %files %{python_files}
 %license COPYING
 %doc CHANGES.rst README.rst
-%{python_sitelib}/*
+%{python_sitelib}/pyudev
+%{python_sitelib}/pyudev-%{version}.dist-info
 
 %changelog
diff --git a/support-pytest-8.patch b/support-pytest-8.patch
new file mode 100644
index 0000000..6fa550c
--- /dev/null
+++ b/support-pytest-8.patch
@@ -0,0 +1,29 @@
+From 536480579e8c1d7232725099e0a75a79950e4dcb Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Wed, 15 May 2024 14:51:13 +1000
+Subject: [PATCH] Support pytest 8 changes.
+
+pytest 8 removed the hook that was calling nose-specific methods, such
+as setup and teardown. However, there is still support for that, the
+methods just have _method on the end, so change them both.
+---
+ tests/test_monitor.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_monitor.py b/tests/test_monitor.py
+index cacd5040..4b49d094 100644
+--- a/tests/test_monitor.py
++++ b/tests/test_monitor.py
+@@ -277,10 +277,10 @@ def make_observer(self, monitor, use_deprecated=False):
+             self.observer = MonitorObserver(monitor, callback=self.callback)
+         return self.observer
+ 
+-    def setup(self):
++    def setup_method(self):
+         self.events = []
+ 
+-    def teardown(self):
++    def teardown_method(self):
+         self.events = None
+ 
+     def test_deprecated_handler(self, fake_monitor, fake_monitor_device):