Sync from SUSE:SLFO:1.1 python-pyserial revision 2616abc1e6012c93a1515c72a6342313

python-pyserial.changes

@@ -1,24 +1,8 @@
 -------------------------------------------------------------------
-Fri Jan 17 09:03:51 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
+Wed Jan 15 13:17:24 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
-
-- fix alternatives
-
--------------------------------------------------------------------
-Wed Jan 15 12:05:07 UTC 2025 - Nico Krapp <nico.krapp@suse.com>
 
 - Use libalternatives instead of update-alternatives, bsc#1235782
 
--------------------------------------------------------------------
-Tue Sep 24 11:27:17 UTC 2024 - ecsos <ecsos@opensuse.org>
-
-- Fix build error under Leap.
-
--------------------------------------------------------------------
-Mon Jul 29 15:07:43 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
-
-- Cherry-pick upstream patch to fix tests with Python 3.13
-  * replace-deprecated-unittest-function.patch
-
 -------------------------------------------------------------------
 Sun Apr 23 23:19:35 UTC 2023 - Matej Cepl <mcepl@suse.com>
 

python-pyserial.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyserial
 #
-# Copyright (c) 2025 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
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
 %if 0%{?suse_version} > 1500
 %bcond_without libalternatives
 %else
@@ -31,9 +30,6 @@ License:        Python-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/pyserial/pyserial
 Source:         https://files.pythonhosted.org/packages/source/p/pyserial/pyserial-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM - pyserial/pyserial#757 - Replace deprecated unittest.findTestCases function
-Patch1:         https://github.com/pyserial/pyserial/pull/757.patch#/replace-deprecated-unittest-function.patch
-BuildRequires:  %{python_module base}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -43,7 +39,7 @@ Requires:       alts
 BuildRequires:  alts
 %else
 Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(postun): update-alternatives
 %endif
 Provides:       python-serial = %{version}
 Obsoletes:      python-serial < %{version}
@@ -65,7 +61,7 @@ Documentation, examples, and help files for %{name}.
 %endif
 
 %prep
-%autosetup -p1 -n pyserial-%{version}
+%setup -q -n pyserial-%{version}
 
 # Unnecessary
 rm serial/tools/list_ports_windows.py \

replace-deprecated-unittest-function.patch

@@ -1,30 +0,0 @@
-From 239f840076bf9da76906dc029f26a423fef4a698 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Fri, 7 Jun 2024 16:45:15 +0200
-Subject: [PATCH] Replace deprecated unittest.findTestCases function
-
-The unittest.findTestCases function was deprecated in Python 3.11 and
-later removed in Python 3.13. The TestLoader methods should be used
-instead [1].
-
-[1] https://docs.python.org/3.13/whatsnew/3.13.html#unittest
-
-Fixes: https://github.com/pyserial/pyserial/issues/754
----
- test/run_all_tests.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/run_all_tests.py b/test/run_all_tests.py
-index e0797e7e..f09fe9bb 100644
---- a/test/run_all_tests.py
-+++ b/test/run_all_tests.py
-@@ -37,7 +37,8 @@
-         print("skipping {}".format(modulename))
-     else:
-         module.PORT = PORT
--        testsuite = unittest.findTestCases(module)
-+        loader = unittest.TestLoader()
-+        testsuite = loader.loadTestsFromModule(module)
-         print("found {} tests in {!r}".format(testsuite.countTestCases(), modulename))
-         mainsuite.addTest(testsuite)
-