summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>2024-10-07 17:38:36 +0200
committerGitHub <noreply@github.com>2024-10-07 17:38:36 +0200
commitd5ccf8203d237687ca2187e083eb41d163086fc4 (patch)
tree046b731dfd0cb936ce1650066edcfcb4baa59c3d
parent416943f7edd26dc3f7c16c6907f1d755fca21a40 (diff)
downloadspack-d5ccf8203d237687ca2187e083eb41d163086fc4.tar.gz
spack-d5ccf8203d237687ca2187e083eb41d163086fc4.tar.bz2
spack-d5ccf8203d237687ca2187e083eb41d163086fc4.tar.xz
spack-d5ccf8203d237687ca2187e083eb41d163086fc4.zip
py-gevent: add patch for Cython 3.0.10 and 3.0.11 (#46845)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
-rw-r--r--var/spack/repos/builtin/packages/py-gevent/cython.patch9
-rw-r--r--var/spack/repos/builtin/packages/py-gevent/package.py9
2 files changed, 12 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/py-gevent/cython.patch b/var/spack/repos/builtin/packages/py-gevent/cython.patch
new file mode 100644
index 0000000000..91e751f2f9
--- /dev/null
+++ b/var/spack/repos/builtin/packages/py-gevent/cython.patch
@@ -0,0 +1,9 @@
+--- a/src/gevent/_gevent_cqueue.pxd
++++ b/src/gevent/_gevent_cqueue.pxd
+@@ -75,7 +75,6 @@ cdef class ItemWaiter(Waiter):
+ cdef readonly Queue queue
+
+
+-@cython.final
+ cdef class UnboundQueue(Queue):
+ pass \ No newline at end of file
diff --git a/var/spack/repos/builtin/packages/py-gevent/package.py b/var/spack/repos/builtin/packages/py-gevent/package.py
index fdcdad0f8d..f4a9d275ff 100644
--- a/var/spack/repos/builtin/packages/py-gevent/package.py
+++ b/var/spack/repos/builtin/packages/py-gevent/package.py
@@ -41,16 +41,13 @@ class PyGevent(PythonPackage):
# https://github.com/gevent/gevent/issues/1599
conflicts("^py-cython@3:", when="@:20.5.0")
- # https://github.com/gevent/gevent/issues/2031
- conflicts(
- "^py-cython@3.0.10",
- when="@:23.9.0",
- msg="py-gevent fails to build when using cython@3.0.10",
- )
# Deprecated compiler options. upstream PR: https://github.com/gevent/gevent/pull/1896
patch("icc.patch", when="@:21.12.0 %intel")
+ # https://github.com/gevent/gevent/issues/2031
+ patch("cython.patch", when="@:24.2.1^py-cython@3.0.10:3.0.11")
+
@run_before("install")
def recythonize(self):
# Clean pre-generated cython files -- we've seen issues with Python 3.8 due to