Skip to content

Prep 2.12.1 #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maddenp-cu merged 2 commits into from
Dec 23, 2025
Merged

Prep 2.12.1 #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75aa676
Reset built number, set version to 2.12.1
maddenp-cu Dec 23, 2025
707e177
Accept timedelta hours as float or string representation of float (#835)
maddenp-cu Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions recipe/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"build": "py_2",
"buildnum": 2,
"build": "py_0",
"buildnum": 0,
"name": "uwtools",
"packages": {
"dev": [
Expand Down Expand Up @@ -36,5 +36,5 @@
"requests >=2.32,<2.33"
]
},
"version": "2.12.0"
"version": "2.12.1"
}
4 changes: 2 additions & 2 deletions src/uwtools/resources/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"buildnum": "2",
"version": "2.12.0"
"buildnum": "0",
"version": "2.12.1"
}
3 changes: 3 additions & 0 deletions src/uwtools/tests/utils/test_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ def test_utils_time_to_timedelta():
("01:02:03", timedelta(hours=1, minutes=2, seconds=3)),
("168:00:00", timedelta(days=7)),
(6, timedelta(hours=6)),
("6", timedelta(hours=6)),
(6.25, timedelta(hours=6, minutes=15)),
("6.25", timedelta(hours=6, minutes=15)),
(timedelta(seconds=1), timedelta(seconds=1)),
]:
assert time.to_timedelta(value=value) == expected # type: ignore[arg-type]
4 changes: 2 additions & 2 deletions src/uwtools/utils/time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def to_iso8601(value: str | datetime) -> str:
def to_timedelta(value: int | str | timedelta) -> timedelta:
if isinstance(value, timedelta):
return value
if isinstance(value, int):
if isinstance(value, (float, int)):
return timedelta(hours=value)
keys = ["hours", "minutes", "seconds"]
args = dict(zip(keys, map(int, value.split(":")), strict=False))
args = dict(zip(keys, map(float, value.split(":")), strict=False))
return timedelta(**args)