Merge pull request #34 from EmDash00/develop

fix circular import
EmDash00 · Jul 21, 2022 · 2d31db7 · 2d31db7
2 parents 5a384d2 + e65a75c
commit 2d31db7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/forcedimension/__init__.py b/forcedimension/__init__.py
@@ -23,7 +23,7 @@
 )
 
 
-__version__ = '0.1.4'
+__version__ = '0.1.5'
 
 
 DefaultVecType = EuclidianVector

diff --git a/forcedimension/dhd/os_independent.py b/forcedimension/dhd/os_independent.py
@@ -7,8 +7,13 @@
 """
 
 from ctypes import c_bool, c_byte, c_double
+from forcedimension import runtime
+
+_libdhd = runtime.load("libdrd")
+
+if _libdhd is None:
+    raise ImportError("There were problems loading libdhd.")
 
-from forcedimension.dhd import _libdhd
 
 _libdhd.dhdKbHit.argtypes = []
 _libdhd.dhdKbHit.restype = c_bool

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "forcedimension"
-version = "0.1.4"
+version = "0.1.5"
 authors = [ 
     { name="Ember Chow", email="emberchow.business@gmail.com" },
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ @@
     )
-    __version__ = '0.1.4'
+    __version__ = '0.1.5'
     DefaultVecType = EuclidianVector
@@ Expand Down @@