scipion-pyworkflow 3.10.3__py3-none-any.whl → 3.10.5__py3-none-any.whl

pyworkflow/constants.py

@@ -43,7 +43,7 @@ VERSION_1 = '1.0.0'
 VERSION_1_1 = '1.1.0'
 VERSION_1_2 = '1.2.0'
 VERSION_2_0 = '2.0.0'
-VERSION_3_0 = '3.10.3'
+VERSION_3_0 = '3.10.5'
 
 # For a new release, define a new constant and assign it to LAST_VERSION
 # The existing one has to be added to OLD_VERSIONS list.

pyworkflow/project/project.py

@@ -1632,6 +1632,10 @@ class Project(object):
         The check will only be done for protocols that have been sent
         to a queue system.
         """
+
+        if len(protocol.getJobIds()) == 0:
+            return
+
         jobid = protocol.getJobIds()[0]
         hostConfig = protocol.getHostConfig()
 

pyworkflow/protocol/protocol.py

@@ -362,17 +362,15 @@ class Protocol(Step):
     # prerequisites of steps, but is easier to keep it
     stepsExecutionMode = STEPS_SERIAL
 
-    @classmethod
-    def modeSerial(cls):
+    def modeSerial(self):
         """ Returns true if steps are run one after another"""
         # Maybe this property can be inferred from the
         # prerequisites of steps, but is easier to keep it
-        return cls.stepsExecutionMode == STEPS_SERIAL
+        return self.stepsExecutionMode == STEPS_SERIAL
 
-    @classmethod
-    def modeParallel(cls):
+    def modeParallel(self):
         """ Returns true if steps are run in parallel"""
-        return not cls.modeSerial()
+        return not self.modeSerial()
 
     def __init__(self, **kwargs):
         Step.__init__(self, **kwargs)
@@ -1935,7 +1933,7 @@ class Protocol(Step):
              'JOB_HOURS': 72,
              'GPU_COUNT': len(self.getGpuList()),
              'QUEUE_FOR_JOBS': 'N',
-             'SCIPION_PROJECT': self.getProject().getShortName(),
+             'SCIPION_PROJECT': "SCIPION_PROJECT",  # self.getProject().getShortName(),
              'SCIPION_PROTOCOL': self.getRunName()
              }
         d.update(queueParams)

{scipion_pyworkflow-3.10.3.dist-info → scipion_pyworkflow-3.10.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scipion-pyworkflow
-Version: 3.10.3
+Version: 3.10.5
 Summary: Simple workflow platform used in scientific applications, initially developed within the Scipion framework for image processing in Electron Microscopy.
 Home-page: https://github.com/scipion-em/scipion-pyworkflow
 Author: J.M. De la Rosa Trevin, Roberto Marabini, Grigory Sharov, Josue Gomez Blanco, Pablo Conesa, Yunior Fonseca Reyna

{scipion_pyworkflow-3.10.3.dist-info → scipion_pyworkflow-3.10.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pyworkflow/__init__.py,sha256=Wr-MVKMQJy_Cy-rpPPB0-pyv8-8tx7GPPaLSNBrV1AI,1246
 pyworkflow/config.py,sha256=_sq6YCRfcfE4WUNXLShgbICbBeTSLpD2KmPVapR1Wos,22306
-pyworkflow/constants.py,sha256=Mq5KWfW83_LPOusFBXKyZN7d3AAgholg7WcKjM1dFmQ,7448
+pyworkflow/constants.py,sha256=-3fJkkmdAhvEm5sXIXLEJI6VpE8Uhzhj2X3Sau732Y4,7448
 pyworkflow/exceptions.py,sha256=3VFxuNJHcIWxRnLPR0vYg0RFAQMmxPBJZLZSi87VI8E,507
 pyworkflow/object.py,sha256=yX3tBUuBssCI8aWGlTmyEKzFE59dJq_7NqllouVzMk0,55069
 pyworkflow/plugin.py,sha256=JJm5plPyOnPAR4To6I5rXVIBda-1Dg-53zicdnLSrac,28858
@@ -53,7 +53,7 @@ pyworkflow/mapper/sqlite_db.py,sha256=HYSXe_fRX1NBKDs6l2zefdO4PMEajnoDMXPjmoFs8K
 pyworkflow/project/__init__.py,sha256=05l9tvr3FfBNL3XNZSbFCs6yO-1HbFlmFu204w7yyKk,1369
 pyworkflow/project/config.py,sha256=F9H1vLJJ9vPyT6zeSqHX69o-wbaN8hWueOuDn53evjc,13692
 pyworkflow/project/manager.py,sha256=bk5hFDuIJqEgELU0plFG-RycGhhFfcJxmPp_qhFj1mE,6758
-pyworkflow/project/project.py,sha256=NGiD0vLZTsPP5vCLh4ddD0D3mmPScnNnbd71IyfWXX4,83818
+pyworkflow/project/project.py,sha256=oBJYSzZyZesXpauMjRo2PyNCr9mYly5zWB8pb-jTSiw,83882
 pyworkflow/project/scripts/clean_projects.py,sha256=5qsLHIyJk7sZJUrfSp8sbMRYTkbZ2purtc-5JJb8awM,2600
 pyworkflow/project/scripts/config.py,sha256=VF4NMsykWzQjCQHRwnfFwxFq2PSk57Ni3TpgTh3nF3w,2933
 pyworkflow/project/scripts/create.py,sha256=cmyYJoKP4J9goPRRtQRM9jrsfp-DARHS0XeKJ0ObSCE,2781
@@ -72,7 +72,7 @@ pyworkflow/protocol/hosts.py,sha256=B9ENNclqYe75CPqAMOoPjwn-r3ST6HxTewXtsK_zWks,
 pyworkflow/protocol/launch.py,sha256=7WKAiHma2tSuhqK4xVnxD_SnVt7Y5qyDFdQwTo8BLF0,11267
 pyworkflow/protocol/package.py,sha256=L6x3HHKtbrhDQRJHD07SG3DQKNMGaRQ0ROoLEY3SuRQ,1444
 pyworkflow/protocol/params.py,sha256=gP6QImgULvzCr-f0iseArIp1bjXm1JuUr9padmuMs7M,25901
-pyworkflow/protocol/protocol.py,sha256=yOvF9QCjIgDzcxr7qMEG3F6ymtW1ocw1KxiKGddOcPw,97560
+pyworkflow/protocol/protocol.py,sha256=YX8C02zfhLCTJPIz8NgZozXPQiKn5IqEXoyyZAHzPLI,97552
 pyworkflow/resources/Imagej.png,sha256=nU2nWI1wxZB_xlOKsZzdUjj-qiCTjO6GwEKYgZ5Risg,14480
 pyworkflow/resources/chimera.png,sha256=AKCuwMqmZo0Cg2sddMUjBWUhmAq-nPsAVCBpVrYNeiQ,815
 pyworkflow/resources/fa-exclamation-triangle_alert.png,sha256=31_XvRu0CkJ2dvHSpcBAR43378lIJTWwiag_A7SuUQc,585
@@ -131,10 +131,10 @@ pyworkflowtests/tests/test_protocol_export.py,sha256=z18nKPkOnrYLMU8KqcnVsF6-ylQ
 pyworkflowtests/tests/test_protocol_output.py,sha256=8gnIFMRNmwPnIBRCG29WHJB6mqK4FLGn1jiXHtTD6pY,5980
 pyworkflowtests/tests/test_streaming.py,sha256=vOH-bKCM-fVUSsejqNnCX5TPXhdUayk9ZtJHsNVcfCY,1615
 pyworkflowtests/tests/test_utils.py,sha256=_pTYGCuXC7YNMdCBzUYNfSBCR3etrHsxHfIhsQi4VPc,7465
-scipion_pyworkflow-3.10.3.dist-info/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-scipion_pyworkflow-3.10.3.dist-info/METADATA,sha256=jERcL0F07HCz0u3s_dfRVMNIK5_scsbw9oai4TlQ9SI,4682
-scipion_pyworkflow-3.10.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-scipion_pyworkflow-3.10.3.dist-info/dependency_links.txt,sha256=D7r_CPRjYRtBb3q_OBocTdsaeXI5TwnYMu5ri0JFtzs,84
-scipion_pyworkflow-3.10.3.dist-info/entry_points.txt,sha256=oR-zwsOICjEPINm-FWVPp-RfnpXZanVal4_XG6BWkkQ,127
-scipion_pyworkflow-3.10.3.dist-info/top_level.txt,sha256=PzyJteyenJwLjAeSFP7oYrTN_U71GABQwET8oLZkh9k,27
-scipion_pyworkflow-3.10.3.dist-info/RECORD,,
+scipion_pyworkflow-3.10.5.dist-info/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+scipion_pyworkflow-3.10.5.dist-info/METADATA,sha256=0CpQn_hwt_ND8BCgrCIJRTrQDLHDZfnJMwWmKCsiXrg,4682
+scipion_pyworkflow-3.10.5.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+scipion_pyworkflow-3.10.5.dist-info/dependency_links.txt,sha256=D7r_CPRjYRtBb3q_OBocTdsaeXI5TwnYMu5ri0JFtzs,84
+scipion_pyworkflow-3.10.5.dist-info/entry_points.txt,sha256=oR-zwsOICjEPINm-FWVPp-RfnpXZanVal4_XG6BWkkQ,127
+scipion_pyworkflow-3.10.5.dist-info/top_level.txt,sha256=PzyJteyenJwLjAeSFP7oYrTN_U71GABQwET8oLZkh9k,27
+scipion_pyworkflow-3.10.5.dist-info/RECORD,,

{scipion_pyworkflow-3.10.3.dist-info → scipion_pyworkflow-3.10.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any