923 fixes (#229)

* Fixed Exception ignored while calling deallocator. Issue 228

* possible fixes for rtd generation. Issue #227

Author: drebbe-intrepid

doc/source/conf.py

@@ -58,25 +58,30 @@
 #
 # Get version dynamically from the same source as pyproject.toml
 try:
-    # First, try to import from the generated ics module (same as pyproject.toml)
-    sys.path.insert(0, os.path.abspath("../../gen"))
+    # First, try the installed package (e.g. ReadTheDocs, pip install .)
     import ics
     version = ics.__version__
     release = ics.__full_version__
-except ImportError:
+except (ImportError, AttributeError):
     try:
-        # Fallback: try dunamai directly (for build environments)
-        import dunamai
-        version = dunamai.Version.from_git().serialize(metadata=False)
-        release = dunamai.Version.from_git().serialize(format="v{base}-{commit}-{timestamp}")
-    except ImportError:
-        # Fallback if neither is available
-        version = "unknown"
-        release = version
-    except Exception:
-        # Fallback if not in a git repository or other issues
-        version = "unknown"
-        release = version
+        # Fallback for local dev: import from generated source tree
+        gen_path = os.path.abspath("../../gen")
+        sys.path.insert(0, gen_path)
+        try:
+            import ics
+            version = ics.__version__
+            release = ics.__full_version__
+        finally:
+            sys.path.remove(gen_path)
+    except (ImportError, AttributeError):
+        try:
+            # Last resort: dunamai from git tags
+            import dunamai
+            version = dunamai.Version.from_git().serialize(metadata=False)
+            release = dunamai.Version.from_git().serialize(format="v{base}-{commit}-{timestamp}")
+        except Exception:
+            version = "unknown"
+            release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

src/ics/py_neo_device_ex.py

@@ -16,7 +16,7 @@ def __init__(self):
         super().__init__()
 
     def __del__(self):
-        if self._auto_handle_close is True:
+        if self._auto_handle_close and ics is not None:
             ics.close_device(self)
 
     def __str__(self):
@@ -101,7 +101,9 @@ def open(self, *args, **kwargs):
 
     def close(self):
         """Close the device. Returns the number of errors on close. See ics.close_device for details on arguments."""
-        return ics.close_device(self)
+        result = ics.close_device(self)
+        self._handle = None
+        return result
 
     def load_default_settings(self):
         """Loads default settings on the device. Requires the device to be open. See ics.load_default_settings for details on arguments."""