diff --git a/corrlib/__init__.py b/corrlib/__init__.py index 91b07f4..ee2b66c 100644 --- a/corrlib/__init__.py +++ b/corrlib/__init__.py @@ -20,4 +20,3 @@ from .import input as input from .initialization import * from .meas_io import * from .find import * -from .version import __version__ diff --git a/corrlib/cli.py b/corrlib/cli.py index b808c13..56b0221 100644 --- a/corrlib/cli.py +++ b/corrlib/cli.py @@ -1,6 +1,6 @@ from typing import Optional import typer -from corrlib import __app_name__, __version__ +from corrlib import __app_name__ from .initialization import create from .toml import import_tomls, update_project, reimport_project from .find import find_record, list_projects @@ -8,6 +8,7 @@ from .tools import str2list from .main import update_aliases from .meas_io import drop_cache as mio_drop_cache import os +from importlib.metadata import version, PackageNotFoundError app = typer.Typer() @@ -15,7 +16,7 @@ app = typer.Typer() def _version_callback(value: bool) -> None: if value: - typer.echo(f"{__app_name__} v{__version__}") + print(__app_name__, version(__app_name__)) raise typer.Exit() diff --git a/pyproject.toml b/pyproject.toml index 8f083bc..4551237 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,30 @@ [build-system] -requires = ["setuptools >= 63.0.0", "wheel"] +requires = ["setuptools >= 63.0.0", "wheel", "setuptools-scm"] build-backend = "setuptools.build_meta" +[project] +name = "corrlib" +dynamic = ["version"] +dependencies = [ + "gitpython>=3.1.45", + 'pyerrors>=2.11.1', + 'datalad>=1.1.0', + 'typer>=0.12.5' +] +description = "Python correlation library" +authors = [ + { name = 'Justus Kuhlmann', email = 'j_kuhl19@uni-muenster.de'} +] + +[project.scripts] +pcl = "corrlib.cli:app" + +[tool.setuptools.packages.find] +include = ["corrlib", "corrlib.*"] + +[tool.setuptools.dynamic] +version = { file = "corrlib/version.py" } + [tool.ruff.lint] ignore = ["F403"]