Merge pull request #972 from I2PC/release-3.24.12

colectin tag name or branch

Author: albertmena

installer/api.py

@@ -34,7 +34,7 @@
 
 # Self imports
 from .cmake import parseCmakeVersions
-from .utils import runJob, getCurrentBranch, isBranchUpToDate, runParallelJobs
+from .utils import runJob, getCurrentName, isBranchUpToDate, runParallelJobs
 from .constants import (API_URL, LOG_FILE, TAIL_LOG_NCHARS, UNKNOWN_VALUE,
 	XMIPP_VERSIONS, XMIPP, VERSION_KEY, MASTER_BRANCHNAME, VERSION_FILE, CMAKE_PYTHON,
 	CMAKE_CUDA, CMAKE_MPI, CMAKE_HDF5, CMAKE_JPEG, CMAKE_SQLITE, CMAKE_JAVA,
@@ -124,7 +124,7 @@ def __getJSON(retCode: int=0) -> Optional[Dict]:
 	jsonData = runParallelJobs([
 		(getOSReleaseName, ()),
 		(__getCPUFlags, ()),
-		(getCurrentBranch, ()),
+		(getCurrentName, ()),
 		(isBranchUpToDate, ()),
 		(__getLogTail, ())
 	])

installer/constants/versions.py

@@ -28,8 +28,8 @@
 from .main import XMIPP, XMIPP_CORE, XMIPP_VIZ, XMIPP_PLUGIN
 
 # Xmipp's current versions
-__LATEST_RELEASE_NUMBER = '3.24.12.0'
-__LATEST_RELEASE_NAME = 'v3.24.12.0-Poseidon'
+LATEST_RELEASE_NUMBER = '3.24.12.0'
+LATEST_RELEASE_NAME = 'v3.24.12.0-Poseidon'
 RELEASE_DATE = '23/12/2024'
 #####################################
 DEVEL_BRANCHNAME = 'devel'					
@@ -39,20 +39,20 @@
 VERNAME_KEY = 'vername'							
 XMIPP_VERSIONS = {									
 	XMIPP: {													
-		VERSION_KEY: __LATEST_RELEASE_NUMBER,				
-		VERNAME_KEY: __LATEST_RELEASE_NAME  
+		VERSION_KEY: LATEST_RELEASE_NUMBER,
+		VERNAME_KEY: LATEST_RELEASE_NAME
 	},																
 	XMIPP_CORE: {											
-		VERSION_KEY: __LATEST_RELEASE_NUMBER,				
-		VERNAME_KEY: __LATEST_RELEASE_NAME  
+		VERSION_KEY: LATEST_RELEASE_NUMBER,
+		VERNAME_KEY: LATEST_RELEASE_NAME
 	},																
 	XMIPP_VIZ: {											
-		VERSION_KEY: __LATEST_RELEASE_NUMBER,				
-		VERNAME_KEY: __LATEST_RELEASE_NAME  
+		VERSION_KEY: LATEST_RELEASE_NUMBER,
+		VERNAME_KEY: LATEST_RELEASE_NAME
 	},																
 	XMIPP_PLUGIN: {										
-		VERSION_KEY: __LATEST_RELEASE_NUMBER,				
-		VERNAME_KEY: __LATEST_RELEASE_NAME  
+		VERSION_KEY: LATEST_RELEASE_NUMBER,
+		VERNAME_KEY: LATEST_RELEASE_NAME
 	}																	
 }																		
 #####################################

installer/main.py

@@ -30,7 +30,7 @@
 from typing import Tuple, Optional
 
 # Module imports
-from .utils import runJob, getCurrentBranch, isProductionMode
+from .utils import runJob, getCurrentBranch, isProductionMode, getCurrentName
 from .logger import logger, yellow, green, bold
 from .constants import (REPOSITORIES, XMIPP_SOURCES, SOURCES_PATH, MASTER_BRANCHNAME,
 	SOURCE_CLONE_ERROR, TAG_BRANCH_NAME, INTERRUPTED_ERROR, VERSION_FILE, RELEASE_DATE,
@@ -101,7 +101,7 @@ def getSuccessMessage() -> str:
 	- (str): Success message.
 	"""
 	# Getting release name
-	branchName = getCurrentBranch()
+	branchName = getCurrentName()
 	releaseName = branchName
 	if branchName is None or branchName == MASTER_BRANCHNAME:
 		releaseName = XMIPP_VERSIONS[XMIPP][VERSION_KEY]

installer/utils.py

@@ -35,6 +35,7 @@
 
 # Installer imports
 from .constants import XMIPP, VERNAME_KEY, XMIPP_VERSIONS, INTERRUPTED_ERROR
+from .constants.versions import LATEST_RELEASE_NAME
 from .logger import blue, red, logger
 
 ####################### RUN FUNCTIONS #######################
@@ -215,6 +216,24 @@ def isTag(dir: str='./') -> bool:
 	currentBranch = getCurrentBranch(dir=dir)
 	return not currentBranch or currentBranch == "HEAD"
 
+
+def getCurrentName():
+	"""
+	### This function returns the current branch of the repository of the given directory or the name of the tag.
+
+	#### Params:
+	- dir (str): Optional. Directory of the repository where the check will happen. Default is current directory.
+
+	#### Returns:
+	- (str): The name of the branch or the tag.
+	"""
+	if isTag():
+		return LATEST_RELEASE_NAME
+	else:
+		return getCurrentBranch()
+
+
+
 def isBranchUpToDate(dir: str='./') -> bool:
 	"""
 	### This function returns True if the current branch is up to date, or False otherwise or if some error happened.