Skip to content

Commit 68ab863

Browse files
resolve conversation
1 parent 73830ba commit 68ab863

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

exasol/toolbox/sphinx/multiversion/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
from exasol.toolbox.sphinx.multiversion.main import main
1919
from exasol.toolbox.sphinx.multiversion.sphinx import setup
20-
from exasol.toolbox.version import VERSION
20+
from exasol.toolbox.version import Version
2121

22-
__version__ = VERSION
22+
__version__ = Version
2323

2424
__all__ = [
2525
"setup",

exasol/toolbox/sphinx/multiversion/sphinx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from sphinx.locale import _
1010
from sphinx.util import i18n as sphinx_i18n
1111

12-
from exasol.toolbox.version import VERSION as PLUGIN_VERSION
12+
from exasol.toolbox.version import Version as PLUGIN_VERSION
1313
from exasol.toolbox.version import Version as ExasolVersion
1414

1515
logger = logging.getLogger(__name__)

test/unit/release_test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,3 @@ def test_extract_release_notes(unreleased_md):
8686
)
8787
actual = extract_release_notes(unreleased_md)
8888
assert expected == actual
89-
90-

test/unit/version_test.py

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
import subprocess
22
from subprocess import CalledProcessError
3-
from unittest.mock import patch, MagicMock
3+
from unittest.mock import (
4+
MagicMock,
5+
patch,
6+
)
47

58
import pytest
69

710
from exasol.toolbox.error import ToolboxError
8-
from exasol.toolbox.nox._release import _trigger_release, ReleaseError
9-
from exasol.toolbox.version import Version, poetry_command
11+
from exasol.toolbox.nox._release import (
12+
ReleaseError,
13+
_trigger_release,
14+
)
15+
from exasol.toolbox.version import (
16+
Version,
17+
poetry_command,
18+
)
1019

1120

1221
@pytest.mark.parametrize(
@@ -176,3 +185,23 @@ def test():
176185

177186
with pytest.raises(ToolboxError):
178187
test()
188+
189+
190+
def test_version_from_python_module(tmp_path):
191+
tmp_file = tmp_path / "file"
192+
file = """
193+
MAJOR = 1
194+
MINOR = 2
195+
PATCH = 3
196+
VERSION = f"{MAJOR}.{MINOR}.{PATCH}"
197+
__version__ = VERSION
198+
"""
199+
tmp_file.write_text(file)
200+
assert Version.from_python_module(tmp_file) == Version.from_string("1.2.3")
201+
202+
203+
def test_version_from_python_no_module_error(tmp_path):
204+
file_path = tmp_path / "file"
205+
file_path.write_text("")
206+
with pytest.raises(ToolboxError) as ex:
207+
Version.from_python_module(file_path)

0 commit comments

Comments
 (0)