Move assimp out of test directory

AuScope · Sep 2, 2024 · 619fb0a · 619fb0a
1 parent 83f17e5
commit 619fb0a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/test/build_assimp.sh → build_assimp.sh b/test/build_assimp.sh → build_assimp.sh
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ dependencies = [
     "numpy",
     "OWSLib==0.28.1",
     "Pillow",
-    "pyassimp @ file:///${PROJECT_ROOT}/test/assimp-5.4.3/port/PyAssimp",
+    "pyassimp @ file:///${PROJECT_ROOT}/assimp-5.4.3/port/PyAssimp",
     "pycollada",
     "pyproj",
     "SQLAlchemy",
@@ -27,4 +27,4 @@ build-backend = "pdm.backend"
 [tool.pdm]
 
 [tool.pdm.scripts]
-pre_install = "sh -c 'cd test && ./build_assimp.sh'"
+pre_install = "sh -c './build_assimp.sh'"
diff --git a/test/run_test.sh b/test/run_test.sh
@@ -11,8 +11,9 @@ pip install --upgrade pip
 pdm install --venv for-test
 
 ASSIMP_VER=5.4.3
+REPO_DIR=`dirname $PWD`
 # NB: assimp shared library is already built as part of 'pdm install' 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/assimp-$ASSIMP_VER/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$REPO_DIR/assimp-$ASSIMP_VER/bin
 echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
 
 # Install coverage

diff --git a/web_build/make_boreholes.py b/web_build/make_boreholes.py
@@ -2,6 +2,8 @@
 """
 This code creates GLTF files and a sqlite database
 which can be used to embed NVCL boreholes in a geological model
+
+Assumes assimp shared library was installed via pdm (see 'pyproject.toml')
 """
 
 import sys