scipion-em-xmipp 26.1.0__py3-none-any.whl → 26.2.0__py3-none-any.whl

{scipion_em_xmipp-26.1.0.dist-info → scipion_em_xmipp-26.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scipion-em-xmipp
-Version: 26.1.0
+Version: 26.2.0
 Summary: Plugin to use Xmipp programs within the Scipion framework.
 Author-email: Oier Lauzirika Zarrabeitia <oierlauzi@bizkaia.eu>, Alberto Garcia Mena <alberto.garcia@cnb.csic.es>, Carlos Oscar Sanchez Sorzano <coss@cnb.csic.es>
 License: GNU General Public License v3 (GPLv3)
@@ -17,6 +17,7 @@ Requires-Dist: joblib
 Requires-Dist: peppercorn
 Requires-Dist: plotter
 Requires-Dist: PyWavelets
+Requires-Dist: xmipp3-installer<3.0.0,>=2.0.4
 Requires-Dist: numpy==1.*
 Dynamic: license-file
 

{scipion_em_xmipp-26.1.0.dist-info → scipion_em_xmipp-26.2.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-scipion_em_xmipp-26.1.0.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-xmipp3/__init__.py,sha256=F10-bvKHA3IktAcQSBwaF_vXaHmpinPgL1QJwPPJufs,13447
+scipion_em_xmipp-26.2.0.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+xmipp3/__init__.py,sha256=dGv2TJsXotcSiKAMG1EYcBlOiEYuUlYCgcWGOJXIAuY,13272
 xmipp3/base.py,sha256=ehZ6iRN1EpZHU_XTmonvoFpDf7xY_1tfPOHDB90KgCk,21294
 xmipp3/bibtex.py,sha256=YZjuuB_9RC4QOOy5r86cRX3ze2EWz43iGzIDQvtu5HQ,28310
 xmipp3/checkProtocolsConf.py,sha256=eJhADp1lv3Mdwe5yYdsVJcVzjelUCqoLHs43XSGzrDo,4428
 xmipp3/constants.py,sha256=-vr810hQABHxFjFtpvuw-henEKTamYqVOiiwsnGc0U8,4024
 xmipp3/logParser.py,sha256=qiBJNqNxSP7o_6yDJkVgJV2OlzK0vMfpErzc2qCZ6Lo,2229
 xmipp3/programs.py,sha256=yrMD0EHEq5j_ODCeINbaCp4CEqSgkmioan1O1mAgPY0,11968
-xmipp3/protocols.conf,sha256=rqtLT-tHUh2L8AyQl3BAk5A926MyRwVEVAKprvByiEQ,14988
+xmipp3/protocols.conf,sha256=dEZS6U3fF48Ee-a5l4XtvpSH5oVpUGQFD5oPU11U6lg,14827
 xmipp3/protocolsCollectInfo.py,sha256=Y36i4yDjhcjzQvBAvB00rGhoRl3gxU2Vy8K_ZgSHl04,10059
 xmipp3/utils.py,sha256=JKuEdR40rn6pdm0puwsgzItbNnrFL4sa7pBymVtRzLM,9125
-xmipp3/version.py,sha256=2ML8qoN7vzU9N2G5eEpVgSqrxoqLWUkGCXPCjcBjBek,2101
+xmipp3/version.py,sha256=EN3aTFa2qzpGF56iRI0PusM3rFgu0Cm8fJdj1Kwxpuw,2101
 xmipp3/wizards.py,sha256=IgT3uCiOYBLOkhX7GWdKcwHOPyZD783HQG0jSjdovRk,20452
 xmipp3/xmipp_logo.png,sha256=ggrFNUy5UEBjvKfNvu0T14Kzolnhc-ij9AQ734R27MY,84496
 xmipp3/xmipp_logo_devel.png,sha256=IQI1XWogTHbJ5UClpatiNcZfwZB7U3zWG3oThpXOvmc,749745
@@ -26,6 +26,8 @@ xmipp3/legacy/protocols/protocol_classification_gpuCorr_full.py,sha256=cnRykHISy
 xmipp3/legacy/protocols/protocol_classification_gpuCorr_semi.py,sha256=7_i1GX6Ty5upG_deW_C2CgD0MOd_3ZdLxgOC8oxXRuA,18244
 xmipp3/legacy/protocols/protocol_classify_kmeans2d.py,sha256=6yZz3o2dooZmo-83vHcT5Pu9Y2p_eA6oKrJuWc7m7D0,12438
 xmipp3/legacy/protocols/protocol_deep_align.py,sha256=61Ju9mgKLB9Sk07KkwH3D932xP137kVsA-ca_9lnDHM,37232
+xmipp3/legacy/protocols/protocol_deep_center.py,sha256=ipLYRKQtktrUYF2O08DzxfA2YAxSAzPf6pREtDSyJlg,7042
+xmipp3/legacy/protocols/protocol_deep_center_predict.py,sha256=jgtXIXuQsNpFisNjPavTp2HJ02nghrHTzXtNqhkgXdk,7405
 xmipp3/legacy/protocols/protocol_deep_denoising.py,sha256=z7lkqP8AylC1NMbHkGORUKLAiS9DAffInaZUpbYAAVo,21324
 xmipp3/legacy/protocols/protocol_enrich.py,sha256=pymPJpNAHUNtECe89-pdzcVmkdNbVN7kp1PGz9NgwYg,25080
 xmipp3/legacy/protocols/protocol_extract_particles_movies.py,sha256=S7wiK398pzmrMke53ZKK1tjwJKLs4SW9Bl-TduSSKiM,23320
@@ -62,7 +64,7 @@ xmipp3/legacy/viewers/viewer_metaprotocol_golden_highres.py,sha256=PwfPMwTo4z_4F
 xmipp3/legacy/viewers/viewer_mltomo.py,sha256=IjSnHQqkZCG45C6B560HV7flW1OGUr2OugGuECs_Zsk,12178
 xmipp3/legacy/viewers/viewer_solid_angles.py,sha256=S2QANz-8VdoK_8kKTYtkhI6SkPQyRuiPkMaz2bQJCIY,3970
 xmipp3/legacy/viewers/viewer_split_volume.py,sha256=4rmH0ixpNS1eR_FLgmD5lgo4IUmqTPNST7_-wLMHkj4,2146
-xmipp3/protocols/__init__.py,sha256=eqlQGTcOi8y_bjOV_ikQ7sXNe3HmHEHT8WrlTyI5los,8348
+xmipp3/protocols/__init__.py,sha256=1_zsOmBQSInuWZiEeayPlAEiNWwg_yYQG-bhbOaVRh4,8225
 xmipp3/protocols/protocol_align_volume.py,sha256=09LvVV_O4ecEe2_KUNtl4se5c_kLogtdARhlvZY9ZeI,20395
 xmipp3/protocols/protocol_align_volume_and_particles.py,sha256=ZgXh8sy_oQPX84L1sPz3I9BOW6fXrP4L247mhFr31mc,11144
 xmipp3/protocols/protocol_analyze_local_ctf.py,sha256=O1_xWXuKDRGvhhd-BQ1DRMKti_KDqNN_kALzUhvN3DQ,7446
@@ -93,8 +95,6 @@ xmipp3/protocols/protocol_ctf_correct_phase.py,sha256=DSX7MvGYUuxgLAj4VMlGa_bqqZ
 xmipp3/protocols/protocol_ctf_correct_wiener2d.py,sha256=VsgUUq0AgvYqfTCO9Gmh9IvsFdXzZZ2gntrnlIV1qRA,6105
 xmipp3/protocols/protocol_ctf_defocus_group.py,sha256=6x_UHiuA9WfPBhd_8rfg09Cy_j4pr6o5RCWTMMz-DPo,8333
 xmipp3/protocols/protocol_ctf_micrographs.py,sha256=Zpfr5q-MV6veZ9VLvTuw2BpYMNfASXEa79ooKoa-RXw,29056
-xmipp3/protocols/protocol_deep_center.py,sha256=ipLYRKQtktrUYF2O08DzxfA2YAxSAzPf6pREtDSyJlg,7042
-xmipp3/protocols/protocol_deep_center_predict.py,sha256=jgtXIXuQsNpFisNjPavTp2HJ02nghrHTzXtNqhkgXdk,7405
 xmipp3/protocols/protocol_deep_hand.py,sha256=6kN0bcwy4mJSlOSScxEuh0Ij57UkjKmzxWzHBpcqgLw,7775
 xmipp3/protocols/protocol_deep_micrograph_screen.py,sha256=k6pEaL2MKTyBcXGkS6sYHQeLaMA-OKMMuSDZuHCKl4c,28004
 xmipp3/protocols/protocol_denoise_particles.py,sha256=_FDzQ4JlNU5_RadEq0F9TfUA8H2jvDi-0pXHcTXDkOQ,7689
@@ -253,8 +253,8 @@ xmipp3/viewers/viewer_volume_consensus.py,sha256=S7YViiZ9w5xAGhfyj1RnDypVWsQ7PKh
 xmipp3/viewers/viewer_volume_deform_zernike3d.py,sha256=BOeI7go5w2RRwGjV9kPm2U76tVJRaHww1Pl0zUCXQRw,8903
 xmipp3/viewers/viewer_volume_strain.py,sha256=4LQUrceVMB6OaAfTpFXdn3vGv-sXQzUIPDEPELYfasY,2378
 xmipp3/viewers/viewer_volume_subtraction.py,sha256=3RbwJQIaCcdzldrFODLgWlFbCips1450RDVzngLRRoU,5121
-scipion_em_xmipp-26.1.0.dist-info/METADATA,sha256=rQhlyZVOZuisiWT1puKWAlepw3lYsUcio7uoX-RhdKU,1894
-scipion_em_xmipp-26.1.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-scipion_em_xmipp-26.1.0.dist-info/entry_points.txt,sha256=9e0I0urUxrUF7LZfZbhoATUnLuGxyJTjj81mP7FhKm8,36
-scipion_em_xmipp-26.1.0.dist-info/top_level.txt,sha256=qnLFoZzwKticb33xgeSAJv3P7nD2nHMTFKYzxAorOOQ,7
-scipion_em_xmipp-26.1.0.dist-info/RECORD,,
+scipion_em_xmipp-26.2.0.dist-info/METADATA,sha256=hx9r-5_pE7FMJEZH3GeYVH95uoYX4DqZMZ7ZxAZNPe4,1940
+scipion_em_xmipp-26.2.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+scipion_em_xmipp-26.2.0.dist-info/entry_points.txt,sha256=9e0I0urUxrUF7LZfZbhoATUnLuGxyJTjj81mP7FhKm8,36
+scipion_em_xmipp-26.2.0.dist-info/top_level.txt,sha256=qnLFoZzwKticb33xgeSAJv3P7nD2nHMTFKYzxAorOOQ,7
+scipion_em_xmipp-26.2.0.dist-info/RECORD,,

xmipp3/__init__.py

@@ -160,7 +160,8 @@ class Plugin(pwem.Plugin):
             "libjpeg-turbo",
         ]
 
-        CONDA_LIBSTDCXX_PACKAGE = "libstdcxx-ng"
+        CONDA_LIBSTDCXX_PACKAGE = "libstdcxx-ng "
+        CONDA_ICU_PACKAGE = 'icu=72'
 
         if Config.isCondaInstallation():
             condaEnvPath = os.environ['CONDA_PREFIX']
@@ -168,7 +169,7 @@ class Plugin(pwem.Plugin):
 
             commands = CondaCommandDef(scipionEnv, cls.getCondaActivationCmd())
             #commands.condaInstall('-c conda-forge --yes '  + ' '.join(CONDA_DEPENDENCIES))
-            commands.condaInstall('-c conda-forge --yes '  + CONDA_LIBSTDCXX_PACKAGE)
+            commands.condaInstall('-c conda-forge --yes '  + CONDA_LIBSTDCXX_PACKAGE + CONDA_ICU_PACKAGE)
             commands.touch("deps_installed.txt")
             env.addPackage(
                 'xmippDep', version=_currentDepVersion,
@@ -177,15 +178,12 @@ class Plugin(pwem.Plugin):
                 neededProgs=['conda'],
                 default=True
             )
-        xmipp3_installer_cmd = f'pip install "xmipp3-installer @ git+{XMIPP3_INSTALLER_URL}@{_xmipp3_installerV}" '
         if develMode:
             xmippSrc = 'xmippDev'
             installCommands = [
-		        (f'{xmipp3_installer_cmd } && '
-				 f'cd {pwem.Config.EM_ROOT} && rm -rf {xmippSrc} && '
+		        (f'cd {pwem.Config.EM_ROOT} && rm -rf {xmippSrc} && '
 		         f'git clone {XMIPP_GIT_URL} {xmippSrc} && '
 		         f'cd {xmippSrc} && '
-		         #f'git checkout {branchTest} && '
 		         f'./xmipp ', COMPILE_TARGETS)
 	        ]
 
@@ -200,8 +198,7 @@ class Plugin(pwem.Plugin):
         else:
             xmippSrc = f'xmipp3-{version._binVersion}'
             installCommands = [
-                (f'{xmipp3_installer_cmd } && '
-				 f'cd .. && rm -rf {xmippSrc} && '
+                (f'cd .. && rm -rf {xmippSrc} && '
                  f'git clone {XMIPP_GIT_URL} -b {version._binVersion} {xmippSrc} && '
                  f'cd {xmippSrc} && '
                  f'./xmipp', COMPILE_TARGETS)

xmipp3/protocols/__init__.py

@@ -133,6 +133,4 @@ from .protocol_volume_consensus import XmippProtVolConsensus
 from .protocol_volume_local_adjust import XmippProtLocalVolAdj
 from .protocol_classes_2d_mapping import XmippProtCL2DMap
 from .protocol_deep_hand import XmippProtDeepHand
-from .protocol_deep_center import XmippProtDeepCenter
 from .protocol_compute_likelihood import XmippProtComputeLikelihood
-from .protocol_deep_center_predict import XmippProtDeepCenterPredict

xmipp3/protocols.conf

@@ -63,8 +63,6 @@ Protocols SPA = [
 	{"tag": "section", "text": "2D", "children": [
 		{"tag": "protocol_group", "text": "Align", "openItem": "False", "children": [
 			{"tag": "protocol", "value": "XmippProtCL2DAlign",   "text": "default"},			
-			{"tag": "protocol", "value": "XmippProtDeepCenter",   "text": "default"},
-			{"tag": "protocol", "value": "XmippProtDeepCenterPredict",   "text": "default"},
 			{"tag": "protocol", "value": "XmippProtApplyAlignment",   "text": "default"},
 			{"tag": "section", "text": "more", "openItem": "False", "children": [
 				{"tag": "protocol", "value": "ProtAlignmentAssign", "text": "default"}

xmipp3/version.py

@@ -40,6 +40,6 @@ _binVersion = 'v4' # Increase it if major release is generated in xmipp
 # - If several of the above are true, only change the biggest one applicable (
 #   for example, if a fix is made and a new protocol are included in the same
 #   pull request, increase the one related to the new protocol).
-__version__ = '26.1.0'
+__version__ = '26.2.0'
 
-_currentDepVersion = '1.0'
+_currentDepVersion = '1.1'