Remove unused _make_version_str and improve version message

Author: samtygier-stfc

mantidimaging/core/utility/test/version_check_test.py

@@ -4,8 +4,7 @@
 import unittest
 from unittest import mock
 
-from mantidimaging.core.utility.version_check import (CheckVersion, _version_is_uptodate, _make_version_str,
-                                                      _parse_version)
+from mantidimaging.core.utility.version_check import (CheckVersion, _version_is_uptodate, _parse_version)
 
 
 class TestCheckVersion(unittest.TestCase):
@@ -20,14 +19,6 @@ def test_parse_version(self):
         assert parsed.version == (9, 9, 9)
         assert parsed.commits == 1234
 
-    def test_make_version_str(self):
-        input_version_str = "9.9.9_1234"
-        parsed = _parse_version(input_version_str)
-
-        version_string = _make_version_str(parsed)
-
-        assert version_string == input_version_str
-
     def test_version_is_uptodate(self):
         for local, remote, is_uptodate in [
             ["8.9.9_1234", "9.9.9_1234", False],

mantidimaging/core/utility/version_check.py

@@ -88,8 +88,10 @@ def is_conda_uptodate(self) -> bool:
     def conda_update_message(self) -> tuple:
         suffix = self.get_conda_installed_label()
 
-        msg = f"Not running the latest Mantid Imaging{suffix}.\n"
-        msg += f"Found version {self.get_conda_installed_version()}, "
+        msg = "Not running the latest Mantid Imaging"
+        if suffix != "main":
+            msg += f"-{suffix}"
+        msg += f".\nFound version {self.get_conda_installed_version()}, "
         msg += f"latest: {self.get_conda_available_version()}.\nPlease check the terminal for an update command!"
 
         detailed = f"Not running the latest Mantid Imaging{suffix}.\n"
@@ -146,10 +148,6 @@ def _parse_version(package_version_string: Optional[str]) -> ParsedVersion:
     return ParsedVersion(tuple(map(int, local_version.split("."))), int(local_commits_since_last))
 
 
-def _make_version_str(parsed: ParsedVersion) -> str:
-    return f"{'.'.join([str(v) for v in parsed.version])}_{parsed.commits}"
-
-
 def _version_is_uptodate(local: ParsedVersion, remote: ParsedVersion):
     if local.version < remote.version or local.commits < remote.commits:
         return False