diff --git a/janus_core/cli/descriptors.py b/janus_core/cli/descriptors.py index 6a2de4aa..a7f9defd 100644 --- a/janus_core/cli/descriptors.py +++ b/janus_core/cli/descriptors.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up MLIP descriptors commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated diff --git a/janus_core/cli/eos.py b/janus_core/cli/eos.py index 3d0643b6..96841243 100644 --- a/janus_core/cli/eos.py +++ b/janus_core/cli/eos.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up eos commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated, get_args diff --git a/janus_core/cli/geomopt.py b/janus_core/cli/geomopt.py index 6dc6fc33..5a2a6aee 100644 --- a/janus_core/cli/geomopt.py +++ b/janus_core/cli/geomopt.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up geomopt commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated, Any diff --git a/janus_core/cli/janus.py b/janus_core/cli/janus.py index 1a4f3732..66a61943 100644 --- a/janus_core/cli/janus.py +++ b/janus_core/cli/janus.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from typing import Annotated @@ -39,7 +36,7 @@ def print_version( version: Annotated[ bool, Option("--version", help="Print janus version and exit.") ] = None, -) -> False: +) -> None: """ Print current janus-core version and exit. diff --git a/janus_core/cli/md.py b/janus_core/cli/md.py index eece4869..eb435ace 100644 --- a/janus_core/cli/md.py +++ b/janus_core/cli/md.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up md commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated, get_args diff --git a/janus_core/cli/phonons.py b/janus_core/cli/phonons.py index b1a95b05..02387395 100644 --- a/janus_core/cli/phonons.py +++ b/janus_core/cli/phonons.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up phonons commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated diff --git a/janus_core/cli/preprocess.py b/janus_core/cli/preprocess.py index be1b4ca8..614ffe1f 100644 --- a/janus_core/cli/preprocess.py +++ b/janus_core/cli/preprocess.py @@ -1,9 +1,6 @@ -# noqa: I002, FA102 """Set up MLIP preprocessing commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated diff --git a/janus_core/cli/singlepoint.py b/janus_core/cli/singlepoint.py index 022110d6..0635ffa6 100644 --- a/janus_core/cli/singlepoint.py +++ b/janus_core/cli/singlepoint.py @@ -1,9 +1,6 @@ -# ruff: noqa: I002, FA100 """Set up singlepoint commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated diff --git a/janus_core/cli/train.py b/janus_core/cli/train.py index 197ca272..de687f93 100644 --- a/janus_core/cli/train.py +++ b/janus_core/cli/train.py @@ -1,9 +1,6 @@ -# noqa: I002, FA102 """Set up MLIP training commandline interface.""" -# Issues with future annotations and typer -# c.f. https://github.com/maxb2/typer-config/issues/295 -# from __future__ import annotations +from __future__ import annotations from pathlib import Path from typing import Annotated diff --git a/pyproject.toml b/pyproject.toml index ad6c4ee3..a23100a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ dependencies = [ "torch<=2.2,>=2.1", "torch-dftd==0.4.0", "typer<1.0.0,>=0.12.5", - "typer-config<2.0.0,>=1.4.0", + "typer-config<2.0.0,>=1.4.2", ] [project.optional-dependencies]