PyPI - xmipp3-installer - Versions diffs - 2.0.0__tar.gz → 2.0.2__tar.gz - Mend

@@ -15,15 +15,17 @@ def get_current_branch(dir: str='./') -> str:
   - dir (str): Optional. Directory of the repository to get current branch from. Default is current directory.
   #### Returns:
-  - (str): The name of the branch, 'HEAD' if a tag, or empty string if given directory is not a repository or a recognizable tag.
+  - (str): The name of the branch, 'HEAD' if it is a tag, or empty string if the given directory is not a repository or a recognizable tag.
   """
   ret_code, branch_name = shell_handler.run_shell_command("git rev-parse --abbrev-ref HEAD", cwd=dir)
   # If there was an error, we are in no branch
-  return branch_name if not ret_code else ''
+  return '' if ret_code else branch_name
 def is_tag(dir: str='./') -> bool:
   """
   ### Returns True if the current Xmipp repository is in a tag.
+  This happens when the current commit matches a tag.
   #### Params:
   - dir (str): Optional. Directory of the repository where the check will happen. Default is current directory.
@@ -31,8 +33,8 @@ def is_tag(dir: str='./') -> bool:
   #### Returns:
   - (bool): True if the repository is a tag. False otherwise.
   """
-  current_branch = get_current_branch(dir=dir)
-  return not current_branch or current_branch == "HEAD"
+  ret_code, _ = shell_handler.run_shell_command("git describe --tags --exact-match HEAD", cwd=dir)
+  return not ret_code
 def is_branch_up_to_date(dir: str='./') -> bool:
   """

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmipp3_installer
-Version: 2.0.0
+Version: 2.0.2
 Summary: Package to handle the installation of Xmipp3
 Author-email: Martín Salinas <ssalinasmartin@gmail.com>
 License: GPL-3.0-only

@@ -1,6 +1,6 @@
 [project]
 name = "xmipp3_installer"
-version = "2.0.0"
+version = "2.0.2"
 authors = [
   { name = "Martín Salinas", email = "ssalinasmartin@gmail.com" },
 ]
@@ -48,3 +48,4 @@ Issues = "https://github.com/I2PC/xmipp3-installer/issues"
 [project.scripts]
 xmipp3_installer = "xmipp3_installer.__main__:main"

@@ -91,7 +91,7 @@ def __get_installation_branch_name(branch_name: str, version_manager: versions_m
   #### Return:
   - (str): Release name if Xmipp is in a release branch, or the branch name otherwise.
   """
-  return branch_name or version_manager.xmipp_version_number
+  return branch_name if (branch_name and not git_handler.is_tag()) else version_manager.xmipp_version_name
 def __get_user_id() -> str:
   """

@@ -74,7 +74,7 @@ class InstallationManager:
         cast(
           versions_manager.VersionsManager,
           self.context[constants.VERSIONS_CONTEXT_KEY]
-        ).xmipp_version_number
+        ).xmipp_version_name
       ))
     logger.close()
     return ret_code

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmipp3_installer
-Version: 2.0.0
+Version: 2.0.2
 Summary: Package to handle the installation of Xmipp3
 Author-email: Martín Salinas <ssalinasmartin@gmail.com>
 License: GPL-3.0-only

xmipp3-installer 2.0.0__tar.gz → 2.0.2__tar.gz