Skip to content

Fix healpix_cxx package for 3 digit cfitsio versions and add version 1.19 for py-healpy #3873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KiSchnelle wants to merge 4 commits into
base: develop
Choose a base branch
from
+33 −8
Open

Fix healpix_cxx package for 3 digit cfitsio versions and add version 1.19 for py-healpy #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc8159c
Fix cfitsio version check broken by 3-part version numbers in healpix…
KiSchnelle Mar 17, 2026
015a7dd
add version 1.19 and set depends for newer and older versions
KiSchnelle Mar 17, 2026
b603756
Merge branch 'spack:develop' into develop
KiSchnelle Mar 17, 2026
b1437d0
Merge branch 'develop' into develop
KiSchnelle Mar 18, 2026
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
8 changes: 8 additions & 0 deletions repos/spack_repo/builtin/packages/healpix_cxx/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ class HealpixCxx(AutotoolsPackage):

version("3.50.0", sha256="6538ee160423e8a0c0f92cf2b2001e1a2afd9567d026a86ff6e2287c1580cb4c")

depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("cfitsio")
depends_on("libsharp", type="build")

Expand All @@ -31,3 +33,9 @@ def patch(self):
spec["libsharp"].prefix.lib
),
)
# Fix cfitsio version check broken by 3-part version numbers
fitshandle = FileFilter("cxxsupport/fitshandle.cc")
fitshandle.filter(
r"int v_header\s*=\s*nearest<int>\(1000\.\*CFITSIO_VERSION\)",
"int v_header = CFITSIO_MAJOR*1000 + CFITSIO_MINOR*100",
)
33 changes: 25 additions & 8 deletions repos/spack_repo/builtin/packages/py_healpy/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,41 @@ class PyHealpy(PythonPackage):
"""healpy is a Python package to handle pixelated data on the sphere."""

homepage = "https://healpy.readthedocs.io/"
pypi = "healpy/healpy-1.13.0.tar.gz"
pypi = "healpy/healpy-1.19.0.tar.gz"

license("GPL-2.0-only")

version("1.19.0", sha256="28e839cb885a23d36c77fc3423a3cb9271a07fda94085bd12fc329f941130ec5")
version("1.14.0", sha256="2720b5f96c314bdfdd20b6ffc0643ac8091faefcf8fd20a4083cedff85a66c5e")
version("1.13.0", sha256="d0ae02791c2404002a09c643e9e50bc58e3d258f702c736dc1f39ce1e6526f73")
version("1.7.4", sha256="3cca7ed7786ffcca70e2f39f58844667ffb8521180ac890d4da651b459f51442")

depends_on("c", type="build") # generated
depends_on("cxx", type="build") # generated
depends_on("fortran", type="build") # generated
depends_on("c", type="build")
depends_on("cxx", type="build")
depends_on("fortran", type="build")

depends_on("py-setuptools@3.2:", type="build")
depends_on("python@:3.10", when="@:1.14")

depends_on("py-setuptools@3.2:72", type="build", when="@:1.14")
depends_on("py-setuptools@3.2:", type="build", when="@1.15:")
depends_on("py-pkgconfig", type="build")
depends_on("py-numpy@1.13:", type=("build", "run"))
depends_on("py-cython", type="build", when="@1.15:")

depends_on("py-numpy@1.13:1", type=("build", "run"), when="@:1.14")
depends_on("py-numpy@1.13:", type=("build", "run"), when="@1.15:")
depends_on("py-scipy", type=("build", "run"))
depends_on("py-astropy", type=("build", "run"))
depends_on("py-matplotlib", type=("build", "run"))
depends_on("py-six", type=("build", "run"))
depends_on("py-six", type=("build", "run"), when="@:1.14")

depends_on("cfitsio", type=("build", "run"))
depends_on("healpix-cxx", type=("build", "run"))
depends_on("healpix-cxx", type=("build", "run"), when="@:1.14")

def patch(self):
if self.spec.satisfies("@:1.14"):
# Fix cfitsio version check for 3-part versions
fitshandle = FileFilter("healpixsubmodule/src/cxx/cxxsupport/fitshandle.cc")
fitshandle.filter(
r"int v_header\s*=\s*nearest<int>\(1000\.\*CFITSIO_VERSION\)",
"int v_header = CFITSIO_MAJOR*1000 + CFITSIO_MINOR*100",
)
Loading