scipion-pyworkflow 3.10.3__tar.gz → 3.10.5__tar.gz

{scipion_pyworkflow-3.10.3 → scipion_pyworkflow-3.10.5}/CHANGES.txt

@@ -1,4 +1,6 @@
-V3.10.3: hotfix: Parallelization with GPUs is fixed and step queue executor fixed with the new implementation.
+V3.10.5: cancel usage of SCIPION_PROJECT in the host template
+V3.10.4: hotfix: Parallelization with GPUs is fixed and step queue executor fixed with the new implementation.
+V3.10.3: Failed hotfix
 V3.10.2: hotfix: Executor frees the GPU/s used via step id instead of node.
 V3.10.1: hotfix: Avoid double Gpu assignment in scipion parallelize protocols with concurrent GPU steps
 V3.10.0

{scipion_pyworkflow-3.10.3/scipion_pyworkflow.egg-info → scipion_pyworkflow-3.10.5}/PKG-INFO

@@ -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 → scipion_pyworkflow-3.10.5}/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.

{scipion_pyworkflow-3.10.3 → scipion_pyworkflow-3.10.5}/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()
 

{scipion_pyworkflow-3.10.3 → scipion_pyworkflow-3.10.5}/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 → scipion_pyworkflow-3.10.5/scipion_pyworkflow.egg-info}/PKG-INFO

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