Skip to content

Commit

Permalink
Altered versioning again - will build now
Browse files Browse the repository at this point in the history
  • Loading branch information
zbilodea committed Oct 20, 2023
1 parent b512fc1 commit 94c1f90
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 5 deletions.
16 changes: 16 additions & 0 deletions _version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# file generated by setuptools_scm
# don't change, don't track in version control
TYPE_CHECKING = False
if TYPE_CHECKING:
from typing import Tuple, Union
VERSION_TUPLE = Tuple[Union[int, str], ...]
else:
VERSION_TUPLE = object

version: str
__version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE

__version__ = version = '1.0.3.dev9+gb512fc1.d20231020'
__version_tuple__ = version_tuple = (1, 0, 3, 'dev9', 'gb512fc1.d20231020')
6 changes: 5 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "_version.py"

[tool.hatch.metadata.hooks.vcs]

[tool.pytest.ini_options]
minversion = "6.0"
Expand Down
9 changes: 5 additions & 4 deletions src/odapt/_version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This file is auto-generated by Hatchling. As such, do not:
# - modify
# - track in version control e.g. be sure to add to .gitignore
__version__ = VERSION = '1.0.2'
# coding: utf-8
# file generated by setuptools_scm
# don't change, don't track in version control
__version__ = version = '1.2.3'
__version_tuple__ = version_tuple = (1, 2, 3)
37 changes: 37 additions & 0 deletions src/odapt/operations/hadd.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,3 +476,40 @@ 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)
#

0 comments on commit 94c1f90

Please sign in to comment.