Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,18 +1,4 @@
-/cffi-0.6.tar.gz
+/cffi-*.tar.gz
-/cffi-0.8.1.tar.gz
+/cffi-*/
-/cffi-0.8.6.tar.gz
+/results_python-cffi/
-/cffi-1.1.2.tar.gz
+*.rpm
-/cffi-1.3.1.tar.gz
-/cffi-1.4.1.tar.gz
-/cffi-1.4.2.tar.gz
-/cffi-1.5.0.tar.gz
-/cffi-1.5.2.tar.gz
-/cffi-1.6.0.tar.gz
-/cffi-1.7.0.tar.gz
-/cffi-1.8.2.tar.gz
-/cffi-1.8.3.tar.gz
-/cffi-1.9.1.tar.gz
-/cffi-1.10.0.tar.gz
-/cffi-1.11.0.tar.gz
-/cffi-1.11.2.tar.gz
-/cffi-1.11.5.tar.gz

113.patch

@@ -0,0 +1,95 @@
+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,11 +1,16 @@
 Name:           python-cffi
-Version:        1.11.5
+%global general_version 1.15.1
-Release:        6%{?dist}
+Version:        %{general_version}%{?prerel:~%{prerel}}
+Release:        2%{?dist}
 Summary:        Foreign Function Interface for Python to call C code
 License:        MIT
-URL:            http://cffi.readthedocs.org/
+URL:            https://cffi.readthedocs.org/
-Source0:        %pypi_source cffi
+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
 
@@ -19,30 +24,13 @@ Foreign Function Interface for Python, providing a convenient and
 reliable way of calling existing C code from Python. The interface is
 based on LuaJIT’s FFI.
 
-%package -n python2-cffi
-Summary:        Foreign Function Interface for Python 3 to call C code
-BuildRequires:  python2-pytest
-BuildRequires:  python2-devel
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-Cython
-BuildRequires:  python2-pycparser
-BuildRequires:  python2-pytest
-%{?python_provide:%python_provide python2-cffi}
-
-%description -n python2-cffi
-Foreign Function Interface for Python, providing a convenient and
-reliable way of calling existing C code from Python. The interface is
-based on LuaJIT’s FFI.
-
 %package -n python3-cffi
 Summary:        Foreign Function Interface for Python 3 to call C code
 BuildRequires:  python3-sphinx
 BuildRequires:  python3-pytest
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  python3-Cython
 BuildRequires:  python3-pycparser
-BuildRequires:  python3-pytest
 %{?python_provide:%python_provide python3-cffi}
 
 %description -n python3-cffi
@@ -58,10 +46,9 @@ BuildArch:      noarch
 Documentation for CFFI, the Foreign Function Interface for Python.
 
 %prep
-%autosetup -n cffi-%{version}
+%autosetup -p1 -n cffi-%{general_version}%{?prerel}
 
 %build
-%py2_build
 %py3_build
 
 cd doc
@@ -69,38 +56,130 @@ make SPHINXBUILD=sphinx-build-3 html
 rm build/html/.buildinfo
 
 %install
-%py2_install
 %py3_install
 
 %check
-# https://bugzilla.redhat.com/show_bug.cgi?id=1552724
+PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest c/ testing/
-%ifarch ppc64le
-  k="not test_float and not test_complex_types"
-%else
-  k=""
-%endif
-
-PYTHONPATH=%{buildroot}%{python2_sitearch} %{__python2} -m pytest -k "$k" c/ testing/
-PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -m pytest -k "$k" c/ testing/
-
-%files -n python2-cffi
-%doc PKG-INFO
-%license LICENSE
-%{python2_sitearch}/cffi/
-%{python2_sitearch}/_cffi_backend.so
-%{python2_sitearch}/cffi-%{version}-py%{python2_version}.egg-info/
 
 %files -n python3-cffi
 %doc PKG-INFO
 %license LICENSE
 %{python3_sitearch}/cffi/
 %{python3_sitearch}/_cffi_backend.*.so
-%{python3_sitearch}/cffi-%{version}-py%{python3_version}.egg-info/
+%{python3_sitearch}/cffi-%{general_version}%{?prerel}-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
+- Fixes: rhbz#1865276
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.14.0-2
+- Rebuilt for Python 3.9
+
+* Mon Feb 10 2020 Lumír Balhar <lbalhar@redhat.com> - 1.14.0
+- Update to 1.14.0 (#1800646)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov 18 2019 Lumír Balhar <lbalhar@redhat.com> - 1.13.2-1
+- Update to 1.13.2 (#1768219)
+
+* Mon Oct 21 2019 Miro Hrončok <mhroncok@redhat.com> - 1.13.1-1
+- Update to 1.13.1 (#1763767)
+
+* Tue Oct 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.13.0-1
+- Update to 1.13.0 (#1761757)
+
+* Sun Oct 13 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.3-5
+- Subpackage python2-cffi has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.3-4
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Mon Aug 26 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.3-3
+- Reduce Python 2 build dependencies
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.3-2
+- Rebuilt for Python 3.8
+
+* Thu Jul 25 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.3-1
+- Update to 1.12.3 (#1701577)
+- https://cffi.readthedocs.io/en/latest/whatsnew.html#v1-12-3
+
+* Mon Jul 15 2019 Petr Viktorin <pviktori@redhat.com> - 1.12.2-2
+- Remove unused build dependency on Cython
+- Remove duplicate build dependency on pytest
+
+* Wed Mar 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1.12.2-1
+- Update to 1.12.2 (#1677888)
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Wed Aug 22 2018 Miro Hrončok <mhroncok@redhat.com> - 1.11.5-6
 - Fix FTBFS (#1605627)
 

sources

@@ -1 +1 @@
-SHA512 (cffi-1.11.5.tar.gz) = 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
+SHA512 (cffi-1.15.1.tar.gz) = e99cafcb029076abc29e435b490fa0573ee2856f4051b7ca8a5b38cd125d56dd9dae8b189f59ceb3d728a675da8ee83239e09e19f8b0feeddea4b186ab5173a5