Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .bumpversion.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.bumpversion]
allow_dirty = true
current_version = "0.184.3"
current_version = "0.184.4"

[[tool.bumpversion.files]]
filename = "pyproject.toml"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"coloredlogs>=15.0.1",
"coverage-conditional-plugin>=0.9.0",
"dycw-pytest-only>=2.1.1",
"dycw-utilities[test]>=0.184.2",
"dycw-utilities[test]>=0.184.3",
"pyright>=1.1.408",
"pytest-cov>=7.0.0",
"pytest-timeout>=2.4.0",
Expand Down Expand Up @@ -116,7 +116,7 @@
name = "dycw-utilities"
readme = "README.md"
requires-python = ">= 3.12"
version = "0.184.3"
version = "0.184.4"

[project.entry-points.pytest11]
pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
Expand Down
16 changes: 14 additions & 2 deletions src/tests/test_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from re import search
from typing import TYPE_CHECKING

from hypothesis import given
from hypothesis import assume, given
from hypothesis.strategies import booleans, integers, none
from pytest import mark, param, raises

Expand Down Expand Up @@ -35,7 +35,18 @@
class TestParseVersion2Or3:
@mark.parametrize(
("text", "expected"),
[param("0.1", Version2(0, 1)), param("0.0.1", Version3(0, 0, 1))],
[
param("0.1", Version2(0, 1)),
param("0.12", Version2(0, 12)),
param("1.23", Version2(1, 23)),
param("12.34", Version2(12, 34)),
param("0.0.1", Version3(0, 0, 1)),
param("0.0.12", Version3(0, 0, 12)),
param("0.1.23", Version3(0, 1, 23)),
param("0.12.34", Version3(0, 12, 34)),
param("1.23.45", Version3(1, 23, 45)),
param("12.34.56", Version3(12, 34, 56)),
],
)
def test_main(self, *, text: str, expected: Version2Or3) -> None:
result = parse_version_2_or_3(text)
Expand Down Expand Up @@ -191,6 +202,7 @@ def test_with_suffix(self, *, version: Version3, suffix: str | None) -> None:

@given(version=version3s())
def test_version2(self, *, version: Version3) -> None:
_ = assume((version.major > 0) or (version.minor > 0))
new = version.version2.version3(patch=version.patch)
assert new == version

Expand Down
2 changes: 1 addition & 1 deletion src/utilities/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/utilities/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,10 @@ def __str__(self) -> str:

def parse_version_2_or_3(text: str, /) -> Version2Or3:
"""Parse a string into a Version2 or Version3 object."""
with suppress(_Version2ParseError):
return Version2.parse(text)
with suppress(_Version3ParseError):
return Version3.parse(text)
with suppress(_Version2ParseError):
return Version2.parse(text)
raise ParseVersion2Or3Error(text=text)


Expand Down
4 changes: 2 additions & 2 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading