PyPI - xmipp3-installer - Versions diffs - 1.1.0__tar.gz → 2.0.1__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: 1.1.0
+Version: 2.0.1
 Summary: Package to handle the installation of Xmipp3
 Author-email: Martín Salinas <ssalinasmartin@gmail.com>
 License: GPL-3.0-only
@@ -33,7 +33,7 @@ Requires-Dist: ninja==1.*; extra == "test"
 Dynamic: license-file
 # xmipp3-installer
-Python package that handles the installation of [xmipp3](https://github.com/I2PC/xmipp).
+Python package that handles the installation of [xmipp3](https://github.com/I2PC/xmipp3).
 ## Installation
 To install the package, simply run:

@@ -1,5 +1,5 @@
 # xmipp3-installer
-Python package that handles the installation of [xmipp3](https://github.com/I2PC/xmipp).
+Python package that handles the installation of [xmipp3](https://github.com/I2PC/xmipp3).
 ## Installation
 To install the package, simply run:

@@ -1,6 +1,6 @@
 [project]
 name = "xmipp3_installer"
-version = "1.1.0"
+version = "2.0.1"
 authors = [
   { name = "Martín Salinas", email = "ssalinasmartin@gmail.com" },
 ]

@@ -91,9 +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.
   """
-  if not branch_name or branch_name == constants.MASTER_BRANCHNAME:
-    return version_manager.xmipp_version_number
-  return branch_name
+  return branch_name or version_manager.xmipp_version_name
 def __get_user_id() -> str:
   """

@@ -7,8 +7,7 @@ XMIPP_VIZ = 'xmippViz'
 XMIPP_SOURCES = [XMIPP_CORE, XMIPP_VIZ]
 # Branch names
-DEVEL_BRANCHNAME = 'devel'
-MASTER_BRANCHNAME = 'master'
+MAIN_BRANCHNAME = 'main'
 # Context
 VERSIONS_CONTEXT_KEY = "versions"

@@ -69,10 +69,7 @@ class ModeGetSourcesExecutor(mode_executor.ModeExecutor):
     """
     current_branch = git_handler.get_current_branch()
     tag_name = None
-    if (
-      not current_branch or
-      current_branch in {constants.MASTER_BRANCHNAME, self.xmipp_tag_name}
-    ):
+    if (not current_branch or current_branch == self.xmipp_tag_name):
       tag_name = self.source_versions.get(source_name)
     return git_handler.get_clonable_branch(source_repo, self.target_branch, tag_name)

xmipp3-installer 1.1.0__tar.gz → 2.0.1__tar.gz