113.patch

@@ -1,95 +0,0 @@
-From 8a3c2c816d789639b49d3ae867213393ed7abdff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-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
-
-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 <function$Zcb1 at 0x$>:
--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 <function$Zcb1 at 0x$>, 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 <function$Zcb1 at 0x$>, 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 <function$Zcb1 at 0x$>, 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
-

python-cffi.spec

@@ -1,16 +1,11 @@
 Name:           python-cffi
-%global general_version 1.15.1
-Version:        %{general_version}%{?prerel:~%{prerel}}
-Release:        2%{?dist}
+Version:        1.14.1
+Release:        1%{?dist}
 Summary:        Foreign Function Interface for Python to call C code
 License:        MIT
 URL:            https://cffi.readthedocs.org/
 Source0:        %{pypi_source cffi}
 
-# Adjust tests for a last minute Python 3.11 change in the traceback format 
-Patch:          https://foss.heptapod.net/pypy/cffi/-/merge_requests/113.patch
-
-BuildRequires:  make
 BuildRequires:  libffi-devel
 BuildRequires:  gcc
 
@@ -46,7 +41,7 @@ BuildArch:      noarch
 Documentation for CFFI, the Foreign Function Interface for Python.
 
 %prep
-%autosetup -p1 -n cffi-%{general_version}%{?prerel}
+%autosetup -p1 -n cffi-%{version}
 
 %build
 %py3_build
@@ -59,77 +54,22 @@ rm build/html/.buildinfo
 %py3_install
 
 %check
-PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest c/ testing/
+# Skip for now the test_unpack_args test as it fails on Python 3.9
+# It expects a slightly different text output
+# Reported upstream: https://bitbucket.org/cffi/cffi/issues/438/test-failures-with-python-39
+PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "not test_unpack_args" c/ testing/
 
 %files -n python3-cffi
 %doc PKG-INFO
 %license LICENSE
 %{python3_sitearch}/cffi/
 %{python3_sitearch}/_cffi_backend.*.so
-%{python3_sitearch}/cffi-%{general_version}%{?prerel}-py%{python3_version}.egg-info/
+%{python3_sitearch}/cffi-%{version}-py%{python3_version}.egg-info/
 
 %files doc
 %doc doc/build/html
 
 %changelog
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 15 2022 Miro Hrončok <mhroncok@redhat.com> - 1.15.1-1
-- Adjust tests for a last minute Python 3.11 change in the traceback format
-
-* Mon Jul 11 2022 Lumír Balhar <lbalhar@redhat.com> - 1.15.1-0
-- Update to 1.15.1
-Resolves: rhbz#2102824
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.15.0-6
-- Rebuilt for Python 3.11
-
-* Wed Mar 30 2022 Miro Hrončok <mhroncok@redhat.com> - 1.15.0-5
-- Fix alignment issue on ppc64le
-- Fixes: rhbz#2046865
-
-* Wed Feb 02 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.15.0-4
-- Backport patch to fix compatibility with Python 3.11
-- Fixes: rhbz#2040165
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 1.15.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
-
-* Tue Dec 21 2021 Lumír Balhar <lbalhar@redhat.com> - 1.15.0-1
-- Update to 1.15.0
-Resolves: rhbz#2013760
-
-* Thu Oct 07 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.15.0~rc2-1
-- Update to 1.15.0rc2
-Resolves: rhbz#2007006
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jul 09 2021 Lumír Balhar <lbalhar@redhat.com> - 1.14.6-1
-- Update to 1.14.6
-Resolves: rhbz#1980622
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.14.5-2
-- Rebuilt for Python 3.10
-
-* Fri Feb 12 2021 Lumír Balhar <lbalhar@redhat.com> - 1.14.5-1
-- Update to 1.14.5
-Resolves: rhbz#1927933
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov 19 2020 Joel Capitao <jcapitao@redhat.com> - 1.14.3-1
-- Update to 1.14.3
-
-* Tue Sep 08 2020 Lumír Balhar <lbalhar@redhat.com> - 1.14.2-1
-- Update to 1.14.2 (#1869032)
-
 * Fri Aug 14 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.1-1
 - Update to 1.14.1
 - Fixes: rhbz#1860698

sources

@@ -1 +1 @@
-SHA512 (cffi-1.15.1.tar.gz) = e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5
+SHA512 (cffi-1.14.1.tar.gz) = bf000904e3d1ece122f49b8c166636c67987e9bf2e34b613d8e013692ed319581f393cd9570d7f050e5c492a8bc1c4cb5bb56eb50c68f9feea973c1e56c951c0