Skip to content

Commit 577197f

Browse files
committed
fix verbose output and deprecation warnings
1 parent e321511 commit 577197f

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
- rename package-directories to `shepherd_client` & `shepherd_server`
77
- pin shepherd-core version
88
- extend services to autostart / depend on mongo-DB
9+
- handle deprecation-warnings of sub-packages
10+
- fix bug not enabling verbose mode on CLI
911
- update tooling
1012

1113
## v2025.08.2

shepherd_client/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ classifiers = [
1818
"Programming Language :: Python :: 3.11",
1919
"Programming Language :: Python :: 3.12",
2020
"Programming Language :: Python :: 3.13",
21+
"Programming Language :: Python :: 3.14",
2122
"License :: OSI Approved :: MIT License",
2223
"Operating System :: OS Independent",
2324
"Natural Language :: English"
2425
]
2526

2627
requires-python = ">=3.10"
2728
dependencies = [
29+
"shepherd_core==2025.8.1",
2830
"requests",
2931
"pydantic[email]>=2.11.5",
30-
"shepherd_core>=2025.6.4",
3132
"exrex", # for automatic password creation
3233
"pyaml",
3334
"typer",

shepherd_client/shepherd_client/cli.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import signal
22
import sys
3+
from importlib import metadata
34
from types import FrameType
45

5-
import shepherd_core
66
import typer
77
from shepherd_core.logger import increase_verbose_level
88
from shepherd_core.logger import log
@@ -38,15 +38,12 @@ def cli_callback(*, verbose: bool = verbose_opt_t) -> None:
3838
@cli.command()
3939
def version() -> None:
4040
"""Prints version-infos (combinable with -v)"""
41-
import click
4241

43-
from .version import version as client_version
44-
45-
log.info("shepherd-client v%s", client_version)
46-
log.debug("shepherd-core v%s", shepherd_core.__version__)
42+
log.info("shepherd-client v%s", metadata.version("shepherd-client"))
4743
log.debug("Python v%s", sys.version)
48-
log.debug("typer v%s", typer.__version__)
49-
log.debug("click v%s", click.__version__)
44+
45+
for package in ["shepherd-core", "typer", "click", "pydantic"]:
46+
log.debug("%s v%s", package, metadata.version(package))
5047

5148

5249
# #######################################################################

shepherd_server/shepherd_server/cli.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
from types import FrameType
66
from typing import Annotated
77

8-
import pydantic
9-
import shepherd_core
10-
import shepherd_herd
118
import typer
129

1310
from .api_experiment.models import WebExperiment
@@ -57,17 +54,20 @@ def cli_callback(*, verbose: bool = verbose_opt_t) -> None:
5754
@cli.command()
5855
def version() -> None:
5956
"""Prints version-infos (combinable with -v)"""
60-
import click
57+
from importlib import metadata
6158

62-
from .version import version as server_version
63-
64-
log.info("shepherd-server v%s", server_version)
65-
log.debug("shepherd-core v%s", shepherd_core.__version__)
66-
log.debug("shepherd-herd v%s", shepherd_herd.__version__)
59+
log.info("shepherd-server v%s", metadata.version("shepherd-server"))
6760
log.debug("Python v%s", sys.version)
68-
log.debug("typer v%s", typer.__version__)
69-
log.debug("click v%s", click.__version__)
70-
log.debug("pydantic v%s", pydantic.__version__)
61+
for package in [
62+
"shepherd-core",
63+
"shepherd-herd",
64+
"typer",
65+
"click",
66+
"pydantic",
67+
"beanie",
68+
"fastapi",
69+
]:
70+
log.debug("%s v%s", package, metadata.version(package))
7171

7272

7373
# #######################################################################

shepherd_server/shepherd_server/logger.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@
2020
def set_verbosity(*, debug: bool = True) -> None:
2121
if debug:
2222
log.setLevel(logging.DEBUG)
23+
queue_handler.setLevel(logging.DEBUG)
2324
else:
2425
log.setLevel(logging.INFO)
26+
queue_handler.setLevel(logging.INFO)
2527

2628

2729
def get_verbosity() -> bool:

shepherd_server/tests/test_experiment_models.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import datetime
22

3+
from shepherd_core import local_tz
34
from shepherd_core.data_models.experiment import Experiment
45
from shepherd_server.api_experiment.models import WebExperiment
56
from shepherd_server.api_user.models import User
@@ -19,7 +20,8 @@ async def test_get_next_scheduling(
1920

2021
assert await WebExperiment.get_next_scheduling() is None
2122

22-
one.requested_execution_at = datetime.date(2000, 1, 1)
23+
tzone = local_tz()
24+
one.requested_execution_at = datetime.datetime(2000, 1, 1, tzinfo=tzone)
2325
await one.save_changes()
2426

2527
_next = await WebExperiment.get_next_scheduling()
@@ -30,19 +32,19 @@ async def test_get_next_scheduling(
3032

3133
_next = await WebExperiment.get_next_scheduling()
3234
assert _next.id == one.id
33-
two.requested_execution_at = datetime.date(2001, 1, 1)
35+
two.requested_execution_at = datetime.datetime(2001, 1, 1, tzinfo=tzone)
3436
await two.save_changes()
3537

3638
_next = await WebExperiment.get_next_scheduling()
3739
assert _next.id == one.id
3840

39-
two.requested_execution_at = datetime.date(1999, 1, 1)
41+
two.requested_execution_at = datetime.datetime(1999, 1, 1, tzinfo=tzone)
4042
await two.save_changes()
4143

4244
_next = await WebExperiment.get_next_scheduling()
4345
assert _next.id == two.id
4446

45-
two.started_at = datetime.date(1999, 1, 1)
47+
two.started_at = datetime.datetime(1999, 1, 1, tzinfo=tzone)
4648
await two.save_changes()
4749

4850
_next = await WebExperiment.get_next_scheduling()

0 commit comments

Comments
 (0)