Fixes to use 'src' strategy to install Underworld with pip install .

MANIFEST.in

@@ -1,9 +1,9 @@
-recursive-include underworld *i
-recursive-include underworld *c
-recursive-include underworld *cpp
-recursive-include underworld *h
-recursive-include underworld *hpp
-recursive-include underworld *py
-recursive-include underworld CMakeLists*
-recursive-include underworld/UWGeodynamics/ressources *.json
-recursive-include underworld/UWGeodynamics/uwgeo-data *
+# recursive-include src/underworld *i
+# recursive-include src/underworld *c
+# recursive-include src/underworld *cpp
+# recursive-include src/underworld *h
+# recursive-include src/underworld *hpp
+#recursive-include src/underworld CMakeLists*
+recursive-include src/underworld *py
+recursive-include src/underworld/UWGeodynamics/ressources *.json
+recursive-include src/underworld/UWGeodynamics/uwgeo-data *

setup.py

@@ -310,11 +310,11 @@ def extend_cmake_prefix_path(path: str) -> None:
     author_email='[email protected]',
     maintainer='Underworld Team',
     maintainer_email='[email protected]',
-    include_package_data=True,
-    package_data={
-        'UWGeodynamics': ['ressources/*', 'uwgeo-data/*'],
-    },
-    packages=find_packages(),
+    include_package_data=True, # use the file './MANIFEST.in' for package data files
+    package_dir={"":"src"}, # directory containing underworld package
+    packages=find_packages(
+      where='src',
+      include = ['underworld', 'UWGeodynamics'],),
     ext_modules=[
         CMakeExtension(name='libUnderworld',
                        install_prefix="underworld",