diff --git a/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch b/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch deleted file mode 100644 index b9b77624185411e512b5356d80c0e62e3d21d45d..0000000000000000000000000000000000000000 --- a/backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 8a3c2c816d789639b49d3ae867213393ed7abdff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 15 Jul 2022 16:11:37 +0200 -Subject: [PATCH] Adjust tests for a last minute Python 3.11 change in the - traceback format - -Reference:https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816 - -See https://github.com/python/cpython/issues/93883 -and https://github.com/python/cpython/pull/93994 - ---HG-- -branch : python3.11.0b4 ---- - c/test_c.py | 35 ++--------------------------------- - 1 file changed, 2 insertions(+), 33 deletions(-) - -diff --git a/c/test_c.py b/c/test_c.py -index cde83b80..048711c7 100644 ---- a/c/test_c.py -+++ b/c/test_c.py -@@ -1342,11 +1342,11 @@ def test_callback_exception(): - except ImportError: - import io as cStringIO # Python 3 - import linecache -- def matches(istr, ipattern, ipattern38, ipattern311): -+ def matches(istr, ipattern, ipattern38, ipattern311=None): - if sys.version_info >= (3, 8): - ipattern = ipattern38 - if sys.version_info >= (3, 11): -- ipattern = ipattern311 -+ ipattern = ipattern311 or ipattern38 - str, pattern = istr, ipattern - while '$' in pattern: - i = pattern.index('$') -@@ -1400,16 +1400,6 @@ Traceback (most recent call last): - File "$", line $, in check_value - $ - ValueError: 42 --""", """\ --Exception ignored from cffi callback : --Traceback (most recent call last): -- File "$", line $, in Zcb1 -- $ -- $ -- File "$", line $, in check_value -- $ -- $ --ValueError: 42 - """) - sys.stderr = cStringIO.StringIO() - bigvalue = 20000 -@@ -1424,13 +1414,6 @@ Traceback (most recent call last): - File "$", line $, in test_callback_exception - $ - OverflowError: integer 60000 does not fit 'short' --""", """\ --Exception ignored from cffi callback , trying to convert the result back to C: --Traceback (most recent call last): -- File "$", line $, in test_callback_exception -- $ -- $ --OverflowError: integer 60000 does not fit 'short' - """) - sys.stderr = cStringIO.StringIO() - bigvalue = 20000 -@@ -1479,19 +1462,6 @@ Traceback (most recent call last): - File "$", line $, in test_callback_exception - $ - TypeError: $integer$ --""", """\ --Exception ignored from cffi callback , trying to convert the result back to C: --Traceback (most recent call last): -- File "$", line $, in test_callback_exception -- $ -- $ --OverflowError: integer 60000 does not fit 'short' --Exception ignored during handling of the above exception by 'onerror': --Traceback (most recent call last): -- File "$", line $, in test_callback_exception -- $ -- $ --TypeError: $integer$ - """) - # - sys.stderr = cStringIO.StringIO() -@@ -1526,7 +1496,6 @@ Exception ignored from cffi callback , trying to convert t - Traceback (most recent call last): - File "$", line $, in test_callback_exception - $ -- $ - OverflowError: integer 60000 does not fit 'short' - Exception ignored during handling of the above exception by 'onerror': - Traceback (most recent call last): --- -GitLab - diff --git a/cffi-1.15.1.tar.gz b/cffi-1.15.1.tar.gz deleted file mode 100644 index 8b6444093ff4be7c574a5ec3bded49f8cec89883..0000000000000000000000000000000000000000 Binary files a/cffi-1.15.1.tar.gz and /dev/null differ diff --git a/cffi-1.16.0.tar.gz b/cffi-1.16.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8e1fc2d247fcd647fa64efec363b3597efd815fc Binary files /dev/null and b/cffi-1.16.0.tar.gz differ diff --git a/python-cffi.spec b/python-cffi.spec index 2badcf4778c5363e4eb4201b1f5a5ec032ef7b68..d55563864992468b2917701c47c40e0c6762386e 100644 --- a/python-cffi.spec +++ b/python-cffi.spec @@ -5,15 +5,13 @@ C Foreign Function Interface for Python. Interact with almost any C code from Py based on C-like declarations that you can often copy-paste from header files or documentation. Name: python-%{_name} -Version: 1.15.1 -Release: 3 +Version: 1.16.0 +Release: 1 Summary: %{_summary} License: MIT URL: http://cffi.readthedocs.org Source0: https://files.pythonhosted.org/packages/source/c/cffi/%{_name}-%{version}.tar.gz -Patch6000: backport-Adjust-tests-for-a-last-minute-Python-3.11-change.patch - Buildrequires: libffi-devel gcc-c++ gcc python3-sphinx %?python_enable_dependency_generator @@ -55,6 +53,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest c/ testing/ %doc PKG-INFO README.md %changelog +* Wed Jan 10 2024 Dongxing Wang - 1.16.0-1 +- Update package to version 1.16.0 + * Thu Jul 27 2023 shixuantong - 1.15.1-3 - Adjust tests for a last minute Python 3.11 change in the traceback format