Merge branch 'develop'

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

README.md

@@ -20,7 +20,7 @@ To open a file:
 ```python
 import FourDimensionalData
 
-data = FourDimensionalData("my_data.blo")
+data = FourDimensionalData.from_file("my_data.blo")
 ```
 
 ### Issues

data4d/__init__.py

@@ -1,3 +1,8 @@
+from pathlib import Path
+
 from .TVIPS import TVIPS
 from .base import FourDimensionalData
 from .blockfile import BLO
+
+__version__ = open(Path(__file__).parent.joinpath("VERSION")).read().strip()
+__all__ = ["FourDimensionalData", "BLO", "TVIPS"]

data4d/base.py

@@ -421,10 +421,10 @@ def from_file(fname: Union[str, Path]) -> FourDimensionalData:
         handler = {"blo": BLO, "tvips": TVIPS}
 
         fname = Path(fname)
-        ext = fname.suffix.strip(os.extsep)
+        ext = fname.suffix.strip(os.extsep).lower()
 
         if ext not in handler:
-            raise TypeError(
+            raise ValueError(
                 f"File format not supported. Supported formats are: {handler.keys()}."
             )
         return handler[ext](fname)

setup.cfg

@@ -16,7 +16,7 @@ classifiers =
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
-description = Parsers for Four Dimensional Electron Microscopy Data
+description = Parsers, Classes, and Functions for Four Dimensional Electron Microscopy Data
 long_description = file: README.md
 keywords = electron microcopy, diffraction, multi-dimensional data
 license_files = 

tests/test_import.py

@@ -0,0 +1,5 @@
+def test_version():
+    from data4d import __version__
+    from packaging.version import parse
+
+    assert parse(__version__) >= parse("0.1.0")