Skip to content

Commit 9f37de4

Browse files
committed
fixed version issues and added missing build requirements to toml
1 parent 3f8d6c9 commit 9f37de4

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=61", "wheel"]
2+
requires = ["setuptools>=80", "wheel", "setuptools-scm>=8"]
33
build-backend = "setuptools.build_meta"
44

55
[project]

src/flowreg3d/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
from flowreg3d.core.optical_flow_3d import get_displacement
22

33
__all__ = ["get_displacement"]
4+
5+
try:
6+
from ._version import version as __version__
7+
except ImportError:
8+
__version__ = "0.0.0+unknown"

src/flowreg3d/cli/main.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,20 @@
66

77
import argparse
88
import sys
9+
from importlib import metadata as importlib_metadata
10+
11+
12+
def _get_cli_version() -> str:
13+
"""Resolve package version for CLI display."""
14+
try:
15+
return importlib_metadata.version("flowreg3d")
16+
except importlib_metadata.PackageNotFoundError:
17+
try:
18+
from flowreg3d._version import version as scm_version
19+
20+
return scm_version
21+
except Exception:
22+
return "0.0.0+unknown"
923

1024

1125
def main():
@@ -30,7 +44,9 @@ def main():
3044
""",
3145
)
3246

33-
parser.add_argument("--version", action="version", version="%(prog)s 0.1.0")
47+
parser.add_argument(
48+
"--version", action="version", version=f"%(prog)s {_get_cli_version()}"
49+
)
3450

3551
parser.add_argument(
3652
"--verbose", "-v", action="store_true", help="Enable verbose output"

tests/cli/test_main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pathlib import Path
1313
import numpy as np
1414

15-
from flowreg3d.cli.main import main
15+
from flowreg3d.cli.main import main, _get_cli_version
1616
from flowreg3d.util.io.tiff_3d import TIFFFileWriter3D
1717

1818

@@ -48,7 +48,7 @@ def test_main_version(self):
4848
assert exc_info.value.code == 0
4949
output = mock_stdout.getvalue()
5050
assert "flowreg3d" in output
51-
assert "0.1.0" in output # Check version number
51+
assert _get_cli_version() in output
5252

5353
def test_main_verbose_flag(self):
5454
"""Test verbose flag is recognized."""

0 commit comments

Comments
 (0)