diff --git a/python-ptyprocess.changes b/python-ptyprocess.changes index 19f27bd..b32ca18 100644 --- a/python-ptyprocess.changes +++ b/python-ptyprocess.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 30 12:03:04 UTC 2024 - John Paul Adrian Glaubitz + +- Cherry-pick upstream patch to fix tests with Python 3.13. + * remove-old-unittest-functions.patch + ------------------------------------------------------------------- Fri Apr 21 12:30:03 UTC 2023 - Dirk Müller diff --git a/python-ptyprocess.spec b/python-ptyprocess.spec index b142bdc..1c99136 100644 --- a/python-ptyprocess.spec +++ b/python-ptyprocess.spec @@ -1,7 +1,7 @@ # # spec file for package python-ptyprocess # -# 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 @@ -26,6 +26,8 @@ License: ISC Group: Development/Languages/Python URL: https://github.com/pexpect/ptyprocess Source: https://files.pythonhosted.org/packages/source/p/ptyprocess/ptyprocess-%{version}.tar.gz +# PATCH-FIX-UPSTREAM - gh/pexpect/ptyprocess#75 - Remove unittest.makeSuite, gone from Python 3.13 +Patch: https://github.com/pexpect/ptyprocess/pull/75.patch#/remove-old-unittest-functions.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -44,6 +46,7 @@ If you need to automate these things, running the process in a pseudo terminal %prep %setup -q -n ptyprocess-%{version} +%patch -P0 -p1 %build %python_build diff --git a/remove-old-unittest-functions.patch b/remove-old-unittest-functions.patch new file mode 100644 index 0000000..6c55e33 --- /dev/null +++ b/remove-old-unittest-functions.patch @@ -0,0 +1,32 @@ +From a44312974bd9084aa568d2e18ce5b2a7e0e45983 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Mon, 23 Oct 2023 15:18:02 +0200 +Subject: [PATCH] Remove unittest.makeSuite, gone from Python 3.13 + +See https://docs.python.org/3.13/whatsnew/3.13.html + +""" +Removed the following unittest functions, deprecated in Python 3.11: + + unittest.findTestCases() + unittest.makeSuite() + unittest.getTestCaseNames() +""" + +The removed call does not seem to have any effect when the file is executed +directly, run trough unittest discover or pytest. +--- + tests/test_invalid_binary.py | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/tests/test_invalid_binary.py b/tests/test_invalid_binary.py +index cf28098..545f9f7 100755 +--- a/tests/test_invalid_binary.py ++++ b/tests/test_invalid_binary.py +@@ -69,6 +69,3 @@ def test_invalid_binary(self): + + if __name__ == '__main__': + unittest.main() +- +-suite = unittest.makeSuite(InvalidBinaryChars,'test') +-