xmipp3-installer 1.1.0__py3-none-any.whl → 2.0.1__py3-none-any.whl

xmipp3_installer/api_client/assembler/installation_info_assembler.py

@@ -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:
   """

xmipp3_installer/installer/constants/__init__.py

@@ -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"

xmipp3_installer/installer/handlers/git_handler.py

@@ -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:
   """

xmipp3_installer/installer/modes/mode_get_sources_executor.py

@@ -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.dist-info → xmipp3_installer-2.0.1.dist-info}/METADATA

@@ -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:

{xmipp3_installer-1.1.0.dist-info → xmipp3_installer-2.0.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 xmipp3_installer/__init__.py,sha256=s67VAuwU_q4SQwrHE2ma0iHaK7B-he8LIAHE6isCmMc,50
 xmipp3_installer/__main__.py,sha256=GjAvEb6__AdjqqtOKc6Q5LQieofjGypAeKmpceqrUsA,124
 xmipp3_installer/api_client/api_client.py,sha256=sMtkC0lvX7sbi0JbKYsCieGgzxU3B1jZNRgcv9AEMxo,1670
-xmipp3_installer/api_client/assembler/installation_info_assembler.py,sha256=hocAe7ynhtOfBOffJnfDhKX_SqOj5-U5-XLqtfhsm6U,5995
+xmipp3_installer/api_client/assembler/installation_info_assembler.py,sha256=tLT6i2inONDRORinK-2azJ8kg7O0D723iIdpaqBhLIg,5915
 xmipp3_installer/application/__init__.py,sha256=kLEk5vEkDPq06r2mKB9FZ2f-yn0Jgm5rSGfL3tBwtik,89
 xmipp3_installer/application/user_interactions.py,sha256=HcNO1YlL2dY5PWZR7hl2Hw366bZ-5fQ7QRcfkwhvr_E,703
 xmipp3_installer/application/cli/__init__.py,sha256=twbZEzUf7ZjBKE07j3DQinLXqa5KOVJ8akiMISx6Rfg,32
@@ -22,12 +22,12 @@ xmipp3_installer/installer/__init__.py,sha256=sxvxGWDy3i9EumDOpI5djVU-gpdlFcuFG1
 xmipp3_installer/installer/installer_service.py,sha256=oRAAjIGb-GA8HlqOcHzxmdKbZccen3noNx6mlEpSvNs,3015
 xmipp3_installer/installer/orquestrator.py,sha256=kmM5DhjGbi2bm_JuXHVPbJvi_89ePb1q38A-RhlRURw,1060
 xmipp3_installer/installer/urls.py,sha256=So738nMK7lkqsLymyc-IJFyeRMx2ZIZ19i-qH_MRAis,521
-xmipp3_installer/installer/constants/__init__.py,sha256=yNZfGRtYy3uuF6WebDr0QqqcVsJlh-oh6DxjK2qtQ0M,352
+xmipp3_installer/installer/constants/__init__.py,sha256=saH8Nk3QpuxuGIZ6kWv8EkAwY3Tx-DHs7Mrt4K405Jc,320
 xmipp3_installer/installer/constants/paths.py,sha256=oqqkZNkhe5i3OCJ4nzeuU4Sq2AvCYZ4UlZ5kiVcCooI,1009
 xmipp3_installer/installer/handlers/__init__.py,sha256=f5XfFtrOTSDRa7Vco8HThqOp3P517dDYa6Nn_DrpUJQ,91
 xmipp3_installer/installer/handlers/conda_handler.py,sha256=PNuuEEWFrUcd_Eo0Bly4hM72TZqdIS_1AZrWyRfyt4k,334
 xmipp3_installer/installer/handlers/generic_package_handler.py,sha256=GPGD_prkc6tU4ZF7YD8MhR3QERpernnTH-ebMop2gdY,680
-xmipp3_installer/installer/handlers/git_handler.py,sha256=3piY-EYYdvve_NMyZMBDM2PhAOJZVdktkS5ScuYv6lM,6449
+xmipp3_installer/installer/handlers/git_handler.py,sha256=9LwekbYm71ziHEQKCF_muHmB6IZLkW61buop2nZSlis,6532
 xmipp3_installer/installer/handlers/shell_handler.py,sha256=YBpN0mul3-7vPw9Er57sgYacZ1gtqS4goVpSR4taOnI,3419
 xmipp3_installer/installer/handlers/versions_manager.py,sha256=jKOJ-fQwVVBVwrusCnXQ7K7vlDTtz8k35NfoRgRnbTs,3796
 xmipp3_installer/installer/handlers/cmake/__init__.py,sha256=lORTw5-xZSBQrwn_BzJ8gtIyYxYsIWDgs1AidCFq_vw,65
@@ -37,7 +37,7 @@ xmipp3_installer/installer/modes/__init__.py,sha256=-8F3Qpzmc9NjP0liDr0U-euw9dDP
 xmipp3_installer/installer/modes/mode_all_executor.py,sha256=tEzhTDWT_5dQXmI-I1X4Rcz2sCw5kX15_DZ-5gsO1hk,2288
 xmipp3_installer/installer/modes/mode_config_executor.py,sha256=TPOHxUzAMZX1F_2W4MdsW_DL0UNZVOTbeKc91bYVDjc,1966
 xmipp3_installer/installer/modes/mode_executor.py,sha256=WTjsIKfxE2JfTfp79uAe3KvdbusBY0xMVN7DIy5SK5g,1332
-xmipp3_installer/installer/modes/mode_get_sources_executor.py,sha256=fwHPKpDuMzXpGdLPHP9A0EuOj8yrVZ1iXUhE546k0Tk,5445
+xmipp3_installer/installer/modes/mode_get_sources_executor.py,sha256=DPYBiMdFlgqNpYyUlPX2wM9zSv3avDoHakkteHACYFU,5393
 xmipp3_installer/installer/modes/mode_git_executor.py,sha256=9BPcHV6n-rASrMfnUxYb6nzcBHpct3RWc4I4hVYy1-U,1719
 xmipp3_installer/installer/modes/mode_selector.py,sha256=2uRrCXt-PfHAFWWx3kslgIUBzK7IdmBpokYW8T9CW70,1568
 xmipp3_installer/installer/modes/mode_version_executor.py,sha256=j9-K44pkXMC1QUBKn9IKwQvKADwNCAqUtFLcAcAWG1Q,6749
@@ -62,9 +62,9 @@ xmipp3_installer/repository/config_vars/default_values.py,sha256=eIUVE8G5I7VP4T3
 xmipp3_installer/repository/config_vars/variables.py,sha256=U2LyYIitxGIO7cP_IG0lfkOQ1IrvFZTOp1l6O98N_34,1513
 xmipp3_installer/shared/file_operations.py,sha256=cwYe3P0Iz3Sq2U4DqANx4AsL1QmqCU-VW2T3C0YcVLA,464
 xmipp3_installer/shared/singleton.py,sha256=nqsCg_rTCdWld2EeLzmvQLjk_goROWWyia3wN7aqHUE,557
-xmipp3_installer-1.1.0.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-xmipp3_installer-1.1.0.dist-info/METADATA,sha256=uMOTsmvo6oYOxsPdW0FY3NMBwqjCshGABHQXmTARt7c,4740
-xmipp3_installer-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xmipp3_installer-1.1.0.dist-info/entry_points.txt,sha256=AbvjNKF8d0LfHkuVMrBz26YhjkzL37m4FYUDDs9UFB4,68
-xmipp3_installer-1.1.0.dist-info/top_level.txt,sha256=PbpSNvfVKVhceWxY482CNYzjSnGbQXl782LlWh39uuw,17
-xmipp3_installer-1.1.0.dist-info/RECORD,,
+xmipp3_installer-2.0.1.dist-info/licenses/LICENSE.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+xmipp3_installer-2.0.1.dist-info/METADATA,sha256=3oMV8F5J4X4DNO3wKRURwDjtK7gvjABpVNbNBoZ5xVE,4741
+xmipp3_installer-2.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xmipp3_installer-2.0.1.dist-info/entry_points.txt,sha256=AbvjNKF8d0LfHkuVMrBz26YhjkzL37m4FYUDDs9UFB4,68
+xmipp3_installer-2.0.1.dist-info/top_level.txt,sha256=PbpSNvfVKVhceWxY482CNYzjSnGbQXl782LlWh39uuw,17
+xmipp3_installer-2.0.1.dist-info/RECORD,,