From 477adda63c5873a626081b41cc41c996254b2112 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 18 Jan 2024 13:39:48 -0500 Subject: [PATCH] Fixed issues getting SHTOOLS compiled properly. --- CMakeLists.txt | 1 - buildscripts/install_editable_debug.sh | 2 +- pyproject.toml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae81ba810..5feb7155e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,6 @@ ELSE() MESSAGE(FATAL_ERROR "Compiler ${CMAKE_Fortran_COMPILER_ID} not recognized!") ENDIF () FIND_PACKAGE(SHTOOLS REQUIRED) - FIND_PACKAGE(FFTW3 REQUIRED) # The following section is modified from Numpy f2py documentation IF(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) diff --git a/buildscripts/install_editable_debug.sh b/buildscripts/install_editable_debug.sh index f7a9b0259..10e5eb850 100755 --- a/buildscripts/install_editable_debug.sh +++ b/buildscripts/install_editable_debug.sh @@ -8,7 +8,7 @@ cd ${ROOT_DIR} python3 -m venv ${VENV_DIR} . ${VENV_DIR}/bin/activate python3 -m pip install --upgrade pip -pip install scikit-build-core pyproject-metadata pathspec ninja cython cmake ffmpeg-python +pip install scikit-build-core pyproject-metadata pathspec ninja cython cmake ffmpeg-python pip install --config-settings=editable.rebuild=true \ --config-settings=build-dir="build/{wheel_tag}" \ --config-settings=cmake.build-type="Debug" \ diff --git a/pyproject.toml b/pyproject.toml index a8a3b7cf8..ca161ee50 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,7 @@ dependencies = [ 'astroquery>=0.4.6', 'tqdm>=4.64.1', 'cython>=3.0.0', - 'pyshtools>=4.10' + 'pyshtools==4.10.4' ] [project.urls]