Skip to content

Commit 98d1c9e

Browse files
committed
Install libcxx when compilers are installed to avoid conflict on mac, but disable the step as yggdrasil installs the compilers
Pin numpy to < 2.0
1 parent 4197de8 commit 98d1c9e

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/test-suite.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ jobs:
154154
miniforge-variant: Miniforge3
155155
miniforge-version: latest
156156
conda-remove-defaults: true
157+
- name: Check conda installation
158+
run: |
159+
conda info
160+
conda list
157161
- name: Configure yggdrasil & compile interface
158162
if: matrix.with-yggdrasil == true
159163
run: |
@@ -172,10 +176,10 @@ jobs:
172176
run: |
173177
conda info
174178
conda list
175-
- name: Install compilers using conda on Linux/Mac
176-
if: matrix.os != 'windows-latest' && matrix.with-valgrind != true
177-
run: |
178-
conda install c-compiler cxx-compiler
179+
# - name: Install compilers using conda on Linux/Mac
180+
# if: matrix.os != 'windows-latest' && matrix.with-valgrind != true
181+
# run: |
182+
# conda install c-compiler cxx-compiler libcxx-devel
179183
- name: Install valgrind on unix systems (and required debug symbols)
180184
if: matrix.os != 'windows-latest' && matrix.with-valgrind == true
181185
run: |

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,10 @@ if(BUILD_TESTS AND BUILD_CXX)
782782
# Build executable directly from source files so that
783783
# non-exported symbols can still be tested by unit tests
784784
add_executable(testRunner ${TEST_LIST} ${ePhoto_SOURCES})
785+
set_target_properties(
786+
testRunner PROPERTIES
787+
DEFINE_SYMBOL "${CXX_LIBRARY_NAME}_EXPORTS"
788+
)
785789
if(ePhoto_DEPENDENCIES)
786790
add_dependencies(testRunner ${ePhoto_DEPENDENCIES})
787791
endif()

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ dependencies:
1212
- python
1313
- sundials>=5.7.0
1414
- yggdrasil
15-
- numpy
15+
- numpy<2.0.0

0 commit comments

Comments
 (0)