diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a7e930d..4c16c36 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -172,7 +172,7 @@ jobs: publish \ --workspace \ --all-features \ - --allow-branch HEAD \ + --allow-branch "main" \ --no-confirm \ --no-verify \ --execute diff --git a/Cargo.toml b/Cargo.toml index 98ed070..e8f4f7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tiffwrite" -version = "2024.10.9" +version = "2024.11.0" edition = "2021" authors = ["Wim Pomp "] license = "GPL-3.0-or-later" diff --git a/py/tiffwrite/__init__.py b/py/tiffwrite/__init__.py index 38eafb9..698514d 100644 --- a/py/tiffwrite/__init__.py +++ b/py/tiffwrite/__init__.py @@ -1,5 +1,6 @@ from __future__ import annotations +from importlib.metadata import version from itertools import product from pathlib import Path from typing import Any, Callable, Sequence @@ -16,6 +17,10 @@ from . import tiffwrite_rs as rs # noqa __all__ = ['IJTiffFile', 'IJTiffParallel', 'FrameInfo', 'Tag', 'tiffwrite'] +try: + __version__ = version(Path(__file__).parent.name) +except Exception: # noqa + __version__ = "unknown" Tag = rs.Tag FrameInfo = tuple[ArrayLike, int, int, int] @@ -172,10 +177,11 @@ def tiffwrite(file: str | Path, data: np.ndarray, axes: str = 'TZCXY', dtype: DT try: - from parfor import ParPool, Task from abc import ABCMeta, abstractmethod from functools import wraps + from parfor import ParPool, Task + class Pool(ParPool): def __init__(self, ijtifffile: IJTiffFile, parallel: Callable[[Any], Sequence[FrameInfo]]): @@ -225,4 +231,4 @@ try: self.pool.close() except ImportError: - IJTiffPool = None + IJTiffParallel = None