Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -62,3 +62,6 @@ Cython-0.12.1.tar.gz
 /Cython-3.0.0rc2.tar.gz
 /Cython-3.0.0.tar.gz
 /Cython-3.0.2.tar.gz
+/Cython-3.0.3.tar.gz
+/Cython-3.0.4.tar.gz
+/Cython-3.0.5.tar.gz

5791.patch

@@ -0,0 +1,35 @@
+From add379d9df149149e3718bd8f71945b7d02fcf4e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 1 Nov 2023 21:32:40 +0100
+Subject: [PATCH] Fix C++17 error: standard attributes in middle of
+ decl-specifiers (CYTHON_UNUSED)
+
+This is only relevant on Python 3.13+
+
+Fixes https://github.com/cython/cython/issues/5790
+---
+ Cython/Utility/FunctionArguments.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Cython/Utility/FunctionArguments.c b/Cython/Utility/FunctionArguments.c
+index 5050a094a88..0dc89c638ab 100644
+--- a/Cython/Utility/FunctionArguments.c
++++ b/Cython/Utility/FunctionArguments.c
+@@ -505,7 +505,7 @@ static int __Pyx_MergeKeywords(PyObject *kwdict, PyObject *source_mapping) {
+     #define __Pyx_KwValues_FASTCALL(args, nargs) ((args) + (nargs))
+     static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues, PyObject *s);
+ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
+-    static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);/*proto*/
++    CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues);/*proto*/
+   #else
+     #define __Pyx_KwargsAsDict_FASTCALL(kw, kwvalues) _PyStack_AsDict(kwvalues, kw)
+   #endif
+@@ -563,7 +563,7 @@ static CYTHON_INLINE PyObject * __Pyx_GetKwValue_FASTCALL(PyObject *kwnames, PyO
+ }
+ 
+ #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030d0000
+-static CYTHON_UNUSED PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
++CYTHON_UNUSED static PyObject *__Pyx_KwargsAsDict_FASTCALL(PyObject *kwnames, PyObject *const *kwvalues) {
+     Py_ssize_t i, nkwargs = PyTuple_GET_SIZE(kwnames);
+     PyObject *dict;
+ 

Cython.spec

@@ -5,7 +5,7 @@
 %bcond cython_compile 1
 
 Name:           Cython
-Version:        3.0.2
+Version:        3.0.5
 Release:        1.0.riscv64%{?dist}
 Summary:        Language for writing Python extension modules
 
@@ -13,16 +13,25 @@ License:        Apache-2.0
 URL:            http://www.cython.org
 Source:         https://github.com/cython/cython/archive/%{version}/Cython-%{version}.tar.gz
 
+# Fix C++17 error: standard attributes in middle of decl-specifiers (CYTHON_UNUSED)
+# This is only relevant on Python 3.13+
+Patch:          https://github.com/cython/cython/pull/5791.patch
+
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 
 %if %{with tests}
 BuildRequires:  gcc-c++
+BuildRequires:  gdb
+# optionally uses Python's test.support for some test
+BuildRequires:  python3-test
+# the Python tests requirements are curated manually
+# the test-requirements*.txt files mix in coverage and optional deps
 BuildRequires:  python3-numpy
 BuildRequires:  python3-pythran
 %if %{undefined rhel}
 # We don't want to pull in ipython to RHEL just to run more tests.
-BuildRequires:  python3-ipython
+# The tests use IPython.testing.globalipapp
+BuildRequires:  python3-ipython+test
 # The tests requiring jedi are optional and skipped when jedi is not installed.
 # Note that the jedi tests were forcefully disabled a long time ago,
 # in https://github.com/cython/cython/issues/1845 far, far away.
@@ -34,10 +43,8 @@ BuildRequires:  python3-jedi
 
 %if %{with cython_compile}
 BuildRequires:  gcc
-%global python3_site %{python3_sitearch}
 %else
 BuildArch:      noarch
-%global python3_site %{python3_sitelib}
 %endif
 
 %global _description %{expand:
@@ -79,42 +86,56 @@ Provides:       bundled(python3dist(tempita))
 %autosetup -n cython-%{version} -p1
 
 
+%generate_buildrequires
+%pyproject_buildrequires
+
+
 %build
-%py3_build -- %{!?with_cython_compile:--no-cython-compile}
+%pyproject_wheel %{!?with_cython_compile:-C--global-option=--no-cython-compile}
 
 
 %install
-%py3_install -- %{!?with_cython_compile:--no-cython-compile}
+%pyproject_install
+%pyproject_save_files Cython cython pyximport
 
 
 %if %{with tests}
 %check
 # run.pstats_profile_test* fails on Python 3.12
+#   https://github.com/cython/cython/issues/5470
+# run.parallel fails on i686
+#   https://github.com/cython/cython/issues/2807
 %{python3} runtests.py -vv --no-pyregr %{?_smp_mflags} \
   --exclude 'run.pstats_profile_test*' \
   %ifarch %{ix86}
-  --exclude run.parallel  # https://github.com/cython/cython/issues/2807
+  --exclude run.parallel \
   %endif
 
 %endif
 
 
-%files -n python3-cython
-%license LICENSE.txt
+%files -n python3-cython -f %{pyproject_files}
 %doc *.txt Demos Doc Tools
 %{_bindir}/cython
 %{_bindir}/cygdb
 %{_bindir}/cythonize
-%{python3_site}/Cython-*.egg-info/
-%{python3_site}/Cython/
-%{python3_site}/pyximport/
-%pycached %{python3_site}/cython.py
 
 
 %changelog
-* Sat Oct 21 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.0.2-1.0.riscv64
+* Tue Dec 05 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.0.5-1.0.riscv64
 - Bootstrap for Python 3.12 on riscv64
 
+* Tue Oct 31 2023 Miro Hrončok <mhroncok@redhat.com> - 3.0.5-1
+- Update to 3.0.5
+
+* Wed Oct 18 2023 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-1
+- Update to 3.0.4
+- Fixes: rhbz#2244865
+
+* Fri Oct 13 2023 Miro Hrončok <mhroncok@redhat.com> - 3.0.3-1
+- Update to 3.0.3
+- Fixes: rhbz#2242429
+
 * Fri Sep 01 2023 Miro Hrončok <mhroncok@redhat.com> - 3.0.2-1
 - Update to 3.0.2
 - Fixes: rhbz#2235027

sources

@@ -1 +1 @@
-SHA512 (Cython-3.0.2.tar.gz) = f55be138efdca6ca61bd39c6f2fab736244328a170a6f6c9bda87036e022c846930b209e9e9101fad889cb179d6e60034ba6f299f14b3056536d46235b438eb7
+SHA512 (Cython-3.0.5.tar.gz) = 585d3fe810ace55278fcc6ea4508b3b5259320f92998cd688da787cd5f88ac5fc2467025f20da6d968969eb3296ae9c517136d24a4dbb475441271227968f6be