fix: version files

.gitignore

@@ -138,8 +138,8 @@ dmypy.json
 cython_debug/
 
 # # setuptools_scm
-# src/*/_version.py
-
+src/*/_version.py
+_version.py
 
 # ruff
 .ruff_cache/

pyproject.toml

@@ -56,8 +56,12 @@ Changelog = "https://github.com/zbilodea/odapt/releases"
 
 
 [tool.hatch.version]
-path = "src/odapt/version.py"
+source = "vcs"
 
+[tool.hatch.build.hooks.vcs]
+version-file = "src/odapt/_version.py"
+
+[tool.hatch.metadata.hooks.vcs]
 
 [tool.pytest.ini_options]
 minversion = "6.0"

src/odapt/__init__.py

@@ -5,7 +5,7 @@
 """
 from __future__ import annotations
 
+from odapt._version import __version__
 from odapt.operations import hadd  # noqa: F401
-from odapt.version import VERSION as __version__
 
 __all__ = ["__version__"]

src/odapt/_version.pyi

@@ -0,0 +1,4 @@
+from __future__ import annotations
+
+version: str
+version_tuple: tuple[int, int, int] | tuple[int, int, int, str, str]

src/odapt/operations/hadd.py

@@ -476,3 +476,41 @@ def main():
         skip_bad_files=args.skip_bad_files,
         union=args.union,
     )
+
+
+# def merge_ttree(ttree1, ttree2, name): #hadd includes
+#     # Use tmpdir? Or just do two at a time, tree reduction style...
+#     if ttree1.name != ttree2.name:
+#         print("Names must be the same")
+
+#     #title must be the same as the file name? maybe is just a tChain thing
+
+#     # Get keys
+#     t1_keys = ttree1.keys(recursive=True)
+#     t2_keys = ttree2.keys(recursive=True)
+
+#     all_keys = np.union1d(t1_keys, t2_keys)
+
+#     for t1_key in t1_keys:
+#         class_name = ttree1[t1_key].class_name()
+#         if class_name == "ttree":
+#             branches = ttree1[t1_key].branches
+
+#         # for t2_key in t2_keys:
+#         if :
+
+
+#         merge_inputs()
+
+#         # Check if histograms
+
+#         write...
+#     #   read key - get get class name
+#     #   inputs(?) = tlist()
+#     #   if isTree:
+#     #       obj = obj.CloneTree?
+#     #       branches = obj.branches
+#     #   for f2 in files[1:]:
+#     #       other_obj = f2.getListOfKeys().readObj()
+#     #       inputs.Add(other_obj)
+#     #

tests/test_hadd.py

@@ -8,7 +8,7 @@
 
 import odapt as od
 
-ROOT = pytest.importorskip("pyarrow")
+ROOT = pytest.importorskip("ROOT")
 
 
 def write_root_file(hist, path):