Merge pull request #5 from LukasEin/main

Fixed installation issues with relative paths in py3.8
globalseismology · Oct 25, 2023 · 613ddf1 · 613ddf1
2 parents 0e93404 + d2fc2cb
commit 613ddf1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/avni/__init__.py b/avni/__init__.py
@@ -19,7 +19,8 @@
 
 __path__ = pkgutil.extend_path(__path__, __name__)
 for importer, modname, ispkg in pkgutil.walk_packages(path=__path__, prefix=__name__+'.'):
-    __import__(modname)
+    if not modname.endswith("setup"): # Relative imports were causing issues with setup.py on python 3.8
+        __import__(modname)
 
 # append unit definitions
 tools.appendunits(constants.ureg)

diff --git a/avni/config/units.ini b/avni/config/units.ini
@@ -2,6 +2,6 @@
 fraction = [] = frac
 percent = 1e-2 frac = pct
 ppm = 1e-6 fraction
-kg/m3 = kg/m^3
-m/s2 = m/s^2
+# kg/m3 = kg/m^3 # standard units cannot be redefined for python 3.8+
+# m/s2 = m/s^2 # standard units cannot be redefined for python 3.8+
 m3 = m^3