Compare commits
9 Commits
Author | SHA256 | Date | |
---|---|---|---|
4e41ebfb5b | |||
106b9d2975 | |||
0ed239bbef | |||
b601192434 | |||
03d7bc041a | |||
115a27c3a7 | |||
36557fefe5 | |||
f837178fc9 | |||
77b169025b |
@@ -1,3 +1,29 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 11 05:49:32 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
|
||||||
|
|
||||||
|
- Switch to pyproject macros.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 17 09:03:51 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>
|
Sun Apr 23 23:19:35 UTC 2023 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package python-pyserial
|
# spec file for package python-pyserial
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -16,6 +16,12 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?suse_version} > 1500
|
||||||
|
%bcond_without libalternatives
|
||||||
|
%else
|
||||||
|
%bcond_with libalternatives
|
||||||
|
%endif
|
||||||
|
|
||||||
%{?sle15_python_module_pythons}
|
%{?sle15_python_module_pythons}
|
||||||
Name: python-pyserial
|
Name: python-pyserial
|
||||||
Version: 3.5
|
Version: 3.5
|
||||||
@@ -25,12 +31,22 @@ License: Python-2.0
|
|||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
URL: https://github.com/pyserial/pyserial
|
URL: https://github.com/pyserial/pyserial
|
||||||
Source: https://files.pythonhosted.org/packages/source/p/pyserial/pyserial-%{version}.tar.gz
|
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 pip}
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
|
BuildRequires: %{python_module wheel}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
BuildRequires: python3-Sphinx
|
BuildRequires: python3-Sphinx
|
||||||
|
%if %{with libalternatives}
|
||||||
|
Requires: alts
|
||||||
|
BuildRequires: alts
|
||||||
|
%else
|
||||||
Requires(post): update-alternatives
|
Requires(post): update-alternatives
|
||||||
Requires(preun):update-alternatives
|
Requires(preun): update-alternatives
|
||||||
|
%endif
|
||||||
Provides: python-serial = %{version}
|
Provides: python-serial = %{version}
|
||||||
Obsoletes: python-serial < %{version}
|
Obsoletes: python-serial < %{version}
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@@ -51,7 +67,7 @@ Documentation, examples, and help files for %{name}.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n pyserial-%{version}
|
%autosetup -p1 -n pyserial-%{version}
|
||||||
|
|
||||||
# Unnecessary
|
# Unnecessary
|
||||||
rm serial/tools/list_ports_windows.py \
|
rm serial/tools/list_ports_windows.py \
|
||||||
@@ -71,12 +87,12 @@ find serial -type f -not -name 'miniterm.py' -exec chmod a-x {} +
|
|||||||
touch test/__init__.py
|
touch test/__init__.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%pyproject_wheel
|
||||||
make %{?_smp_mflags} -C documentation html && rm documentation/_build/html/.buildinfo # Build HTML documentation
|
make %{?_smp_mflags} -C documentation html && rm documentation/_build/html/.buildinfo # Build HTML documentation
|
||||||
sed -i -e "1{s|^#![[:space:]]*\/.*bin.*$|#!%{_bindir}/python3|}" examples/*.py
|
sed -i -e "1{s|^#![[:space:]]*\/.*bin.*$|#!%{_bindir}/python3|}" examples/*.py
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%python_install
|
%pyproject_install
|
||||||
|
|
||||||
%python_clone -a %{buildroot}%{_bindir}/pyserial-miniterm
|
%python_clone -a %{buildroot}%{_bindir}/pyserial-miniterm
|
||||||
%python_clone -a %{buildroot}%{_bindir}/pyserial-ports
|
%python_clone -a %{buildroot}%{_bindir}/pyserial-ports
|
||||||
@@ -89,6 +105,11 @@ rm documentation/_build/doctrees/environment.pickle
|
|||||||
%check
|
%check
|
||||||
%python_exec test/run_all_tests.py
|
%python_exec test/run_all_tests.py
|
||||||
|
|
||||||
|
%pre
|
||||||
|
# If libalternatives is used: Removing old update-alternatives entries.
|
||||||
|
%python_libalternatives_reset_alternative pyserial-miniterm
|
||||||
|
%python_libalternatives_reset_alternative pyserial-ports
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%python_install_alternative pyserial-miniterm
|
%python_install_alternative pyserial-miniterm
|
||||||
%python_install_alternative pyserial-ports
|
%python_install_alternative pyserial-ports
|
||||||
@@ -103,7 +124,7 @@ rm documentation/_build/doctrees/environment.pickle
|
|||||||
%python_alternative pyserial-miniterm
|
%python_alternative pyserial-miniterm
|
||||||
%python_alternative pyserial-ports
|
%python_alternative pyserial-ports
|
||||||
%{python_sitelib}/serial/
|
%{python_sitelib}/serial/
|
||||||
%{python_sitelib}/pyserial-%{version}-py*.egg-info
|
%{python_sitelib}/pyserial-%{version}.dist-info
|
||||||
|
|
||||||
%if 0%{?suse_version} > 1500
|
%if 0%{?suse_version} > 1500
|
||||||
%files -n %{name}-doc
|
%files -n %{name}-doc
|
||||||
|
30
replace-deprecated-unittest-function.patch
Normal file
30
replace-deprecated-unittest-function.patch
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
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)
|
||||||
|
|
Reference in New Issue
Block a user