Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions repos/spack_repo/builtin/packages/py_pygrib/fix-cython-3.1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From: Thomas Bouvier <[email protected]>
Subject: Fix build with Cython 3.1

--- a/src/pygrib/_pygrib.pyx
+++ b/src/pygrib/_pygrib.pyx
@@ -420,7 +419,7 @@ cdef class open(object):
grbs = [self.message(n) for n in xrange(beg,end,inc)]
self.seek(msg) # put iterator back in original position
return grbs
- elif type(key) == int or type(key) == long:
+ elif type(key) == int:
# for an integer, return a single grib message.
msg = self.tell()
grb = self.message(key)
@@ -1925,8 +1924,8 @@ Example usage:
# if there are no matches for this key, just skip it
if not size:
continue
- if typ == 'l' or (type(v) == int or type(v) == long):
- longval = long(v)
+ if typ == 'l' or (type(v) == int):
+ longval = int(v)
err = grib_index_select_long(self._gi, key, longval)
if err:
raise RuntimeError(_get_error_message(err))
3 changes: 3 additions & 0 deletions repos/spack_repo/builtin/packages/py_pygrib/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,8 @@ class PyPygrib(PythonPackage):
depends_on("py-numpy@2:", type=("build", "run"))
depends_on("eccodes", type=("build", "run"))

# See: https://github.com/jswhit/pygrib/pull/269
patch("fix-cython-3.1.patch", when="@2.1.6 ^[email protected]:")

def setup_build_environment(self, env):
env.set("ECCODES_DIR", self.spec["eccodes"].prefix)
Loading