From f7450b981cd5b8dc19c4211c6dfe7932967fb2aa Mon Sep 17 00:00:00 2001 From: Mousa Zeid Baker Date: Mon, 10 Oct 2022 13:07:00 +0200 Subject: [PATCH 1/3] fix: poetry version type --- pyproject.toml | 2 +- src/poetryup/core/poetry.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a3ca422..6c98fe6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetryup" -version = "0.12.2" +version = "0.12.3" description = "Update dependencies and bump their version in the pyproject.toml file" authors = ["Mousa Zeid Baker"] packages = [ diff --git a/src/poetryup/core/poetry.py b/src/poetryup/core/poetry.py index 3909c9a..aad75b5 100644 --- a/src/poetryup/core/poetry.py +++ b/src/poetryup/core/poetry.py @@ -10,12 +10,13 @@ class Poetry: """A helper class to run poetry commands""" @property - def version(self) -> str: + def version(self) -> version_.Version: """Return the installed poetry version""" output = cmd_run(["poetry", "--version"], capture_output=True) # output is: 'Poetry (version x.y.z)' - return output.rsplit(" ", 1).pop().strip().replace(")", "") + version = output.rsplit(" ", 1).pop().strip().replace(")", "") + return version_.parse(version) def show(self) -> str: """Run poetry show command From b7d24c432ca3176009b91cbe20f55e4d4c7c014e Mon Sep 17 00:00:00 2001 From: Mousa Zeid Baker Date: Mon, 10 Oct 2022 13:10:17 +0200 Subject: [PATCH 2/3] fix: tests --- tests/unit/test_poetry.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_poetry.py b/tests/unit/test_poetry.py index ee15d1d..3c396fd 100644 --- a/tests/unit/test_poetry.py +++ b/tests/unit/test_poetry.py @@ -1,3 +1,4 @@ +from packaging import version as version_ from pytest_mock import MockerFixture from poetryup.core.poetry import Poetry @@ -11,7 +12,7 @@ def test_version_poetry_1_1_x( return_value="Poetry version 1.2.3", ) poetry = Poetry() - assert poetry.version == "1.2.3" + assert poetry.version == version_.parse("1.2.3") def test_version_poetry_1_2_x( @@ -22,4 +23,4 @@ def test_version_poetry_1_2_x( return_value="Poetry (version 1.2.3)", ) poetry = Poetry() - assert poetry.version == "1.2.3" + assert poetry.version == version_.parse("1.2.3") From 36c521d1ad572cc7beafd1e0cb3528d890d59149 Mon Sep 17 00:00:00 2001 From: Mousa Zeid Baker Date: Mon, 10 Oct 2022 13:11:28 +0200 Subject: [PATCH 3/3] fix: tests --- tests/unit/test_poetry.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/unit/test_poetry.py b/tests/unit/test_poetry.py index 3c396fd..90c991e 100644 --- a/tests/unit/test_poetry.py +++ b/tests/unit/test_poetry.py @@ -1,4 +1,3 @@ -from packaging import version as version_ from pytest_mock import MockerFixture from poetryup.core.poetry import Poetry @@ -12,7 +11,7 @@ def test_version_poetry_1_1_x( return_value="Poetry version 1.2.3", ) poetry = Poetry() - assert poetry.version == version_.parse("1.2.3") + assert poetry.version.base_version == "1.2.3" def test_version_poetry_1_2_x( @@ -23,4 +22,4 @@ def test_version_poetry_1_2_x( return_value="Poetry (version 1.2.3)", ) poetry = Poetry() - assert poetry.version == version_.parse("1.2.3") + assert poetry.version.base_version == "1.2.3"