Merge pull request #874 from I2PC/release-3.24.12a

Release 3.24.12a

.github/workflows/release.yml

@@ -39,7 +39,7 @@ jobs:
         cat latest_changelog_with_title.md | tail -n +2 > latest_changelog.md
         RELEASE_NAME=$(cat latest_changelog_with_title.md | head -n 1 | sed 's/## Release //' | sed 's/^ *//')
         echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_OUTPUT
-        echo "TAG_NAME=v${RELEASE_NAME// /}" >> $GITHUB_OUTPUT
+        echo "TAG_NAME=${RELEASE_NAME// /}" >> $GITHUB_OUTPUT
     
     - name: Generate tag
       id: tag_version

CHANGELOG.md

@@ -1,6 +1,7 @@
-## Release 3.24.12.1 - Poseidon
+## Release 3.24.12.2 - Poseidon
    - More scipion-em-xmipp
       - Updating version for pypi requirements
+      - Bug cloning tag
 ## Release 3.24.12 - Poseidon
    - New protocols
       - apply_tilt_to_ctf: Apply a local deviation to the CTF based on the micrograph's tilt

xmipp3/__init__.py

@@ -46,8 +46,8 @@
 
 type_of_version = version.type_of_version
 _logo = version._logo
-_current_xmipp_tag = version._current_xmipp_tag
-_currentBinVersion = version._currentBinVersion
+_binTagVersion = version._binTagVersion
+_pluginTagVersion= version._pluginTagVersion
 _currentDepVersion = version._currentDepVersion
 __version__ = version.__version__
 
@@ -185,20 +185,16 @@ def defineBinaries(cls, env):
                 default=False
             )
 
-        #Release binaries installation
-        # if Version(scipionAppVersion) < Version('3.7.1'):
-	    #     print("\n---------------------------------------------------\nAttention! The current version of 'scipion-app' is outdated.\nTo update it to the latest version, please run the following command in your terminal:\n\n  scipion3 update\n\nThis command will update 'scipion-app' to the latest available version.\nNote: The minimum required version of 'scipion-app' is 3.7.1.")
-        # else:
-        tag = version._current_xmipp_tag
-        xmippSrc = f'xmippSrc-{tag}'
+        xmippSrc = f'xmippSrc-{version._binTagVersion}'
         installCommands = [
             (f'cd .. && rm -rf {xmippSrc} && '
-            f'git clone --depth 1 --branch {tag} {XMIPP_GIT_URL} {xmippSrc} && '
+            f'git clone {XMIPP_GIT_URL} {xmippSrc} && '
             f'cd {xmippSrc} && '
-            f'./xmipp -b {tag}', COMPILE_TARGETS)
+            f'git checkout {version._binTagVersion} && '
+            f'./xmipp --production True ', COMPILE_TARGETS)
         ]
         env.addPackage(
-            'xmippSrc', version=tag,
+            'xmippSrc', version=version._binTagVersion,
             tar='void.tgz',
             commands=installCommands,
             neededProgs=['git', 'gcc', 'g++', 'cmake', 'make'],

xmipp3/version.py

@@ -27,7 +27,12 @@
 
 type_of_version = 'release' #'release' 'devel'
 _logo = "xmipp_logo" + ("" if type_of_version == 'release' else '_devel') + '.png'
-_currentBinVersion = '3.24.12.0'
-_current_xmipp_tag = 'v3.24.12.1-Poseidon' #'devel' or for release similar to 'v3.24.12-Poseidon'
+
+_binVersion = 'v3.24.12.0' # Increase it if hotfix in binaries (xmipp, xmippCore and/or XmippViz)
+_pluginVersion = 'v3.24.12.2' # Increase it if hotfix in binaries (xmipp, xmippCore and/or XmippViz) or in scipion-em-xmipp
+
+_binTagVersion = _binVersion + '-Poseidon' #'devel' or _binVersion + '-Poseidon'
+_pluginTagVersion = _pluginVersion + '-Poseidon'  #'devel' or _pluginVersion + '-Poseidon'
+
 _currentDepVersion = '1.0'
-__version__ = _currentBinVersion[2:] + ".1"  # Set this to ".0" on each xmipp binary release, otherwise increase it --> ".1", ".2", ...
+__version__ = _pluginVersion # Name of the pypi package