Merge pull request #1527 from diddledani/fix-python-modules

Fix python modules and library search paths

snap/local/usr/lib/python3.8/sitecustomize.py

@@ -1,22 +0,0 @@
-import site
-import os
-
-snap_dir = os.getenv("SNAP")
-snapcraft_stage_dir = os.getenv("SNAPCRAFT_STAGE")
-snapcraft_part_install = os.getenv("SNAPCRAFT_PART_INSTALL")
-
-# Do not include snap_dir during builds as this will include
-# snapcraft's in-snap site directory.
-if snapcraft_stage_dir is not None and snapcraft_part_install is not None:
-    site_directories = [snapcraft_stage_dir, snapcraft_part_install]
-else:
-    superbuild_dir = os.path.join(snap_dir, 'odm/SuperBuild/install')
-    site_directories = [snap_dir, superbuild_dir]
-
-for d in site_directories:
-    if d:
-        site_dir = os.path.join(d, "lib/python3.8/site-packages")
-        site.addsitedir(site_dir)
-
-if snap_dir:
-    site.ENABLE_USER_SITE = False

snap/snapcraft.yaml

@@ -191,24 +191,17 @@ parts:
     source: snap/local
     plugin: dump
 
-  snapcraft-preload:
-    source: https://github.com/sergiusens/snapcraft-preload.git
-    plugin: cmake
-    cmake-parameters:
-      - -DCMAKE_INSTALL_PREFIX=/
-    build-packages:
-      - on amd64:
-        - gcc-multilib
-        - g++-multilib
+plugs:
+  shared-memory:
+    private: true
 
 apps:
   opendronemap:
     command: odm/run.sh
-    command-chain:
-      - bin/snapcraft-preload # Fixes multiprocessing python module
     environment:
       # Ensure libraries are found
-      LD_LIBRARY_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack:$LD_LIBRARY_PATH
+      LD_LIBRARY_PATH: $SNAP/odm/SuperBuild/install/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/blas:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/lapack
+      PYTHONPATH: $SNAP/odm/SuperBuild/install:$SNAP/lib/python3.8/site-packages:$SNAP/usr/lib/python3/dist-packages/:$SNAP/usr/lib/python3.8
     plugs:
       - home
       - network