Run tests from a subdirectory, to avoid attempted relative import of …

…compiled extension
hpc4cmb · Jan 1, 2025 · e13a38e · e13a38e
1 parent 52db014
commit e13a38e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -82,8 +82,9 @@ jobs:
       - name: Install Dependencies
         run: |
           source ~/conda/etc/profile.d/conda.sh \
-            && conda activate base \
-            && conda install --file packaging/conda_build_requirements.txt
+            && conda create --yes -n test python==3.12 \
+            && conda activate test \
+            && conda install --yes --file packaging/conda_build_requirements.txt
 
       - name: Install
         run: |
@@ -96,11 +97,17 @@ jobs:
           source ~/conda/etc/profile.d/conda.sh \
             && conda activate base \
             && export OMP_NUM_THREADS=2 \
-            && python3 -c 'import flacarray.tests; flacarray.tests.run()'
+            && mkdir -p test \
+            && pushd test >/dev/null 2>&1 \
+            && python3 -c 'import flacarray.tests; flacarray.tests.run()' \
+            && popd >/dev/null 2>&1
 
       - name: Run MPI Tests
         run: |
           source ~/conda/etc/profile.d/conda.sh \
             && conda activate base \
             && export OMP_NUM_THREADS=1 \
-            && mpirun -np 2 python -c 'import flacarray.tests; flacarray.tests.run()'
+            && mkdir -p test \
+            && pushd test >/dev/null 2>&1 \
+            && mpirun -np 2 python -c 'import flacarray.tests; flacarray.tests.run()' \
+            && popd >/dev/null 2>&1
diff --git a/flacarray/libflacarray/meson.build b/flacarray/libflacarray/meson.build
@@ -15,10 +15,10 @@ ext_sources = [
 ]
 
 py.extension_module(
-  'libflacarray',
-  ext_sources,
-  dependencies: [openmp, libflac],
-  include_directories: [incdir_numpy],
-  install: true,
-  subdir: 'flacarray',
+    'libflacarray',
+    ext_sources,
+    dependencies: [openmp, libflac],
+    include_directories: [incdir_numpy],
+    install: true,
+    subdir: 'flacarray',
 )
diff --git a/packaging/wheels/install_deps_linux.sh b/packaging/wheels/install_deps_linux.sh
@@ -15,8 +15,8 @@ fi
 export PREFIX="${prefix}"
 
 # Make sure lib64 points to lib, so that our dependencies can be found
-rm -rf "${prefix}/lib64"
-ln -s "${prefix}/lib" "${prefix}/lib64"
+sudo rm -rf "${prefix}/lib64"
+sudo ln -s "${prefix}/lib" "${prefix}/lib64"
 
 # Location of this script
 pushd $(dirname $0) >/dev/null 2>&1

diff --git a/packaging/wheels/install_deps_osx.sh b/packaging/wheels/install_deps_osx.sh
@@ -15,8 +15,8 @@ fi
 export PREFIX="${prefix}"
 
 # Make sure lib64 points to lib, so that our dependencies can be found
-rm -rf "${prefix}/lib64"
-ln -s "${PREFIX}/lib" "${PREFIX}/lib64"
+sudo rm -rf "${prefix}/lib64"
+sudo ln -s "${PREFIX}/lib" "${PREFIX}/lib64"
 
 # If we are running on github CI, ensure that permissions
 # are set on /usr/local.  See: