Changed _trigger_release

Author: tomuben

exasol/toolbox/nox/_release.py

@@ -8,7 +8,6 @@
 import nox
 from nox import Session
 
-import noxconfig
 from exasol.toolbox.nox._shared import (
     Mode,
     _version,
@@ -20,6 +19,7 @@
     ReleaseTypes,
     Version,
 )
+from noxconfig import PROJECT_CONFIG
 
 
 def _create_parser() -> argparse.ArgumentParser:
@@ -72,7 +72,7 @@ class ReleaseError(Exception):
     """Error during trigger release"""
 
 
-def _trigger_release() -> Version:
+def _trigger_release(project_config) -> Version:
     def run(*args: str):
         try:
             return subprocess.run(
@@ -103,8 +103,8 @@ def run(*args: str):
     run("git", "push", "origin", str(release_version))
 
     if (
-        hasattr(noxconfig.PROJECT_CONFIG, "create_major_version_tags")
-        and noxconfig.PROJECT_CONFIG.create_major_version_tags
+        hasattr(project_config, "create_major_version_tags")
+        and project_config.create_major_version_tags
     ):
         major_release_version = f"v{release_version.major}"
         run("git", "tag", "-f", str(major_release_version))
@@ -128,28 +128,26 @@ def prepare_release(session: Session) -> None:
     _ = _update_project_version(session, new_version)
 
     changelogs = Changelogs(
-        changes_path=noxconfig.PROJECT_CONFIG.doc / "changes",
-        root_path=noxconfig.PROJECT_CONFIG.root,
+        changes_path=PROJECT_CONFIG.doc / "changes",
+        root_path=PROJECT_CONFIG.root,
         version=new_version,
     )
     changelogs.update_changelogs_for_release()
     changed_files = changelogs.get_changed_files()
 
-    pm = NoxTasks.plugin_manager(noxconfig.PROJECT_CONFIG)
+    pm = NoxTasks.plugin_manager(PROJECT_CONFIG)
     pm.hook.prepare_release_update_version(
-        session=session, config=noxconfig.PROJECT_CONFIG, version=new_version
+        session=session, config=PROJECT_CONFIG, version=new_version
     )
 
     if args.no_add:
         return
 
     changed_files += [
-        noxconfig.PROJECT_CONFIG.root / "pyproject.toml",
-        noxconfig.PROJECT_CONFIG.version_file,
+        PROJECT_CONFIG.root / "pyproject.toml",
+        PROJECT_CONFIG.version_file,
     ]
-    results = pm.hook.prepare_release_add_files(
-        session=session, config=noxconfig.PROJECT_CONFIG
-    )
+    results = pm.hook.prepare_release_add_files(session=session, config=PROJECT_CONFIG)
     changed_files += [f for plugin_response in results for f in plugin_response]
     _add_files_to_index(
         session,
@@ -172,4 +170,4 @@ def prepare_release(session: Session) -> None:
 @nox.session(name="release:trigger", python=False)
 def trigger_release(session: Session) -> None:
     """trigger an automatic project release"""
-    print(f"new version: {_trigger_release()}")
+    print(f"new version: {_trigger_release(PROJECT_CONFIG)}")

test/unit/release_test.py

@@ -41,15 +41,15 @@ def simulate_pass(args, **kwargs):
             return self._get_subprocess_run_mock(args)
 
         with patch("subprocess.run", side_effect=simulate_pass):
-            result = _trigger_release()
+            result = _trigger_release(noxconfig.PROJECT_CONFIG)
         assert result == mock_from_poetry.return_value
 
     def test_creates_major_version_tag(self, mock_from_poetry):
         def simulate_pass(args, **kwargs):
             return self._get_subprocess_run_mock(args)
 
         with patch("subprocess.run", side_effect=simulate_pass) as subprocess_mock:
-            result = _trigger_release()
+            result = _trigger_release(noxconfig.PROJECT_CONFIG)
             assert subprocess_mock.mock_calls == [
                 call(
                     ("git", "remote", "show", "origin"),
@@ -97,19 +97,15 @@ def simulate_pass(args, **kwargs):
             ]
         assert result == mock_from_poetry.return_value
 
-    @pytest.fixture
-    def mock_project_config(self, monkeypatch):
+    def test_not_creates_major_version_tag(self, mock_from_poetry):
         class DummyConfig:
             pass
 
-        monkeypatch.setattr(noxconfig, "PROJECT_CONFIG", DummyConfig())
-
-    def test_not_creates_major_version_tag(self, mock_from_poetry, mock_project_config):
         def simulate_pass(args, **kwargs):
             return self._get_subprocess_run_mock(args)
 
         with patch("subprocess.run", side_effect=simulate_pass) as subprocess_mock:
-            result = _trigger_release()
+            result = _trigger_release(DummyConfig)
             assert subprocess_mock.mock_calls == [
                 call(
                     ("git", "remote", "show", "origin"),
@@ -167,7 +163,7 @@ def simulate_fail(args, **kwargs):
 
         with patch("subprocess.run", side_effect=simulate_fail):
             with pytest.raises(ReleaseError) as ex:
-                _trigger_release()
+                _trigger_release(noxconfig.PROJECT_CONFIG)
         assert str(error_cmd) in str(ex)
 
     def test_default_branch_could_not_be_found(self, mock_from_poetry):
@@ -178,7 +174,7 @@ def simulate_fail(args, **kwargs):
 
         with patch("subprocess.run", side_effect=simulate_fail):
             with pytest.raises(ReleaseError) as ex:
-                _trigger_release()
+                _trigger_release(noxconfig.PROJECT_CONFIG)
         assert "default branch could not be found" in str(ex)
 
     def test_tag_already_exists(self, mock_from_poetry):
@@ -191,7 +187,7 @@ def simulate_fail(args, **kwargs):
 
         with patch("subprocess.run", side_effect=simulate_fail):
             with pytest.raises(ReleaseError) as ex:
-                _trigger_release()
+                _trigger_release(noxconfig.PROJECT_CONFIG)
         assert f"tag {version} already exists" in str(ex)
 
     def test_release_already_exists(self, mock_from_poetry):
@@ -204,5 +200,5 @@ def simulate_fail(args, **kwargs):
 
         with patch("subprocess.run", side_effect=simulate_fail):
             with pytest.raises(ReleaseError) as ex:
-                _trigger_release()
+                _trigger_release(noxconfig.PROJECT_CONFIG)
         assert f"release {version} already exists" in str(ex)