scipion-pyworkflow 3.10.5__py3-none-any.whl → 3.10.6__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.5'
+VERSION_3_0 = '3.10.6'
 
 # 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.
@@ -73,6 +73,16 @@ SCIPION_HOME_VAR = 'SCIPION_HOME'
 SCIPION_TESTS = 'SCIPION_TESTS'
 SCIPION_SCRATCH = 'SCIPION_SCRATCH'
 
+# VARIABLE names in host.conf
+PARALLEL_COMMAND_VAR = 'PARALLEL_COMMAND'
+PLUGIN_MODULE_VAR = 'PLUGIN_MODULE'
+QUEUE_FOR_JOBS = 'QUEUE_FOR_JOBS'
+
+
+# Launching constants
+RUN_JOB_GPU_PARAM = 'GPU' # Param name to "place" GPU ids used to build a run command.
+RUN_JOB_GPU_PARAM_SEARCH = "%("+ RUN_JOB_GPU_PARAM +")s"
+
 # FONT
 SCIPION_DEFAULT_FONT_SIZE = 10
 
@@ -215,4 +225,3 @@ DEFAULT_EXECUTION_ACTION_ALL = 3
 # Id field/attribute constants
 ID_COLUMN='id'
 ID_ATTRIBUTE='_objId'
-

pyworkflow/gui/form.py

@@ -1743,7 +1743,7 @@ class FormWindow(Window):
                         entry = self._createBoundEntry(procFrame, pwutils.Message.VAR_MPI)
                         entry.grid(row=r2, column=c2 + 1, padx=(0, 5), sticky='w')
 
-                        helpMessage += pwutils.Message.HELP_PARALLEL_MPI
+                        helpMessage += '\n' + pwutils.Message.HELP_PARALLEL_MPI
 
 
                 btnHelp = IconButton(procFrame, pwutils.Message.TITLE_COMMENT,

pyworkflow/gui/project/searchprotocol.py

@@ -139,7 +139,7 @@ class SearchProtocolWindow(SearchBaseWindow):
     def _addProtocolToTree(self, protList):
         """ Adds the items in protList to the tree
 
-        :param protList: List of tuples with all the values/colunms used in search ans shown in the tree"""
+        :param protList: List of tuples with all the values/columns used in the search search to show in the tree"""
 
         for key, label, installed, help, streamified, beta, new, updated, weight in protList:
             tag = ProtocolTreeConfig.getProtocolTag(installed == 'installed',

pyworkflow/gui/project/viewprotocols_extra.py

@@ -167,7 +167,7 @@ class RunIOTreeProvider(pwgui.tree.TreeProvider):
         that is more readable for the user to pick the desired object.
         """
         label = 'None'
-        if obj:
+        if obj is not None:
             label = obj.getObjLabel()
             if not len(label.strip()):
                 parentLabel = parent.getObjLabel() if parent else 'None'
@@ -241,7 +241,6 @@ class RunIOTreeProvider(pwgui.tree.TreeProvider):
 
             return infoPtr
 
-
         if obj is None or not obj.hasValue():
             return None
 

pyworkflow/mapper/sqlite.py

@@ -1027,13 +1027,16 @@ class SqliteFlatMapper(Mapper):
 
         return obj
         
-    def __iterObjectsFromRows(self, objRows, objectFilter=None):
+    def __iterObjectsFromRows(self, objRows, objectFilter=None, rowFilter=None):
         for objRow in objRows:
+            if rowFilter and not rowFilter(objRow):
+                continue
+
             obj = self.__objFromRow(objRow)
             if objectFilter is None or objectFilter(obj):
                 yield obj
         
-    def __objectsFromRows(self, objRows, iterate=False, objectFilter=None):
+    def __objectsFromRows(self, objRows, iterate=False, objectFilter=None, rowFilter=None):
         """Create a set of object from a set of rows
         Params:
             objRows: rows result from a db select.
@@ -1043,9 +1046,9 @@ class SqliteFlatMapper(Mapper):
         """
         if not iterate:
             return [obj.clone()
-                    for obj in self.__iterObjectsFromRows(objRows, objectFilter)]
+                    for obj in self.__iterObjectsFromRows(objRows, objectFilter, rowFilter)]
         else:
-            return self.__iterObjectsFromRows(objRows, objectFilter)
+            return self.__iterObjectsFromRows(objRows, objectFilter, rowFilter)
          
     def selectBy(self, iterate=False, objectFilter=None, **args):
         """Select object meetings some criteria"""
@@ -1053,7 +1056,7 @@ class SqliteFlatMapper(Mapper):
         return self.__objectsFromRows(objRows, iterate, objectFilter)
     
     def selectAll(self, iterate=True, objectFilter=None, orderBy=ID,
-                  direction='ASC', where='1', limit=None):
+                  direction='ASC', where='1', limit=None, rowFilter=None):
         # Just a sanity check for emtpy sets, that doesn't contains
         # 'Properties' table
         if not self.db.hasTable('Properties'):
@@ -1076,7 +1079,7 @@ and restarting scipion. Export command:
     export SQLITE_TMPDIR=. """ % str(e)
             raise OperationalError(msg)
         
-        return self.__objectsFromRows(objRows, iterate, objectFilter) 
+        return self.__objectsFromRows(objRows, iterate, objectFilter, rowFilter)
 
     def unique(self, labels, where=None):
         """ Returns a list (for a single label) or a dictionary with unique values for the passed labels.

pyworkflow/object.py

@@ -1233,12 +1233,13 @@ class Set(Object):
         return self._getMapper().exists(itemId)
 
     def iterItems(self, orderBy='id', direction='ASC', where=None,
-                  limit=None, iterate=True):
+                  limit=None, iterate=True, rowFilter=None):
         return self._getMapper().selectAll(orderBy=orderBy,
                                            direction=direction,
                                            where=where,
                                            limit=limit,
-                                           iterate=iterate)  # has flat mapper, iterate is true
+                                           iterate=iterate,
+                                           rowFilter=rowFilter)  # has flat mapper, iterate is true
 
     def getFirstItem(self):
         """ Return the first item in the Set. """

pyworkflow/plugin.py

@@ -508,7 +508,7 @@ class Domain:
 
         raiseMsg = "%s\n %s\n%s\n" % (msgStr, calling, hint)
         if doRaise:
-            raise Exception("\n\n" + raiseMsg)
+            raise ImportError("\n\n" + raiseMsg)
         else:
             logger.info(raiseMsg)
 

pyworkflow/project/project.py

@@ -48,7 +48,7 @@ from pyworkflow.mapper import SqliteMapper
 from pyworkflow.protocol.constants import (MODE_RESTART, MODE_RESUME,
                                            STATUS_INTERACTIVE, ACTIVE_STATUS,
                                            UNKNOWN_JOBID, INITIAL_SLEEP_TIME, STATUS_FINISHED)
-from pyworkflow.protocol.protocol import ProtImportBase, Protocol
+from pyworkflow.protocol.protocol import Protocol
 
 from . import config
 
@@ -306,14 +306,17 @@ class Project(object):
         if creationTime:  # CreationTime was found in project.sqlite
             ctStr = creationTime[0] # This is our String type instance
 
-            # We store it in mem as dateime
+            # We store it in mem as datetime
             self._creationTime = ctStr
 
         else:
-            # We should read the creation time from settings.sqlite and
-            # update the CreationTime in the project.sqlite
-            self._creationTime = pwobj.String(self.getSettingsCreationTime())
-            self._storeCreationTime()
+
+            # If connected to project.sqlite and not any or the run.db
+            if self.path.endswith(PROJECT_DBNAME):
+                # We should read the creation time from settings.sqlite and
+                # update the CreationTime in the project.sqlite
+                self._creationTime = pwobj.String(self.getSettingsCreationTime())
+                self._storeCreationTime()
 
     # ---- Helper functions to load different pieces of a project
     def _loadDb(self, dbPath):
@@ -1961,37 +1964,31 @@ class Project(object):
         self.settings.setReadOnly(value)
 
     def fixLinks(self, searchDir):
-        logger.info("Fixing project links. Searching at %s" % searchDir)
+        logger.info(f"Fixing links for project {self.getShortName()}. Searching in: {searchDir}")
         runs = self.getRuns()
 
+        counter = 0
         for prot in runs:
-            print (prot)
-            broken = False
-            if isinstance(prot, ProtImportBase) or prot.getClassName() == "ProtImportMovies":
-                logger.info("Import detected")
-                for _, attr in prot.iterOutputAttributes():
-                    for f in attr.getFiles():
-                        if ':' in f:
-                            f = f.split(':')[0]
-
-                        if not os.path.exists(f):
-                            if not broken:
-                                broken = True
-                                logger.info("Found broken links in run: %s" %
-                                      pwutils.magenta(prot.getRunName()))
-                            logger.info("  Missing: %s" % pwutils.magenta(f))
-
-                            if os.path.islink(f):
-                                sourceFile = os.path.realpath(f)
-                                logger.info("    -> %s" % pwutils.red(sourceFile))
-
-                                newFile = pwutils.findFile(os.path.basename(sourceFile),
-                                                       searchDir,
-                                                       recursive=True)
-                                if newFile:
-                                    logger.info("  Found file %s, creating link... %s" % (newFile,
-                                        pwutils.green("   %s -> %s" % (f, newFile))))
-                                    pwutils.createAbsLink(newFile, f)
+            if prot.getClassName().startswith("ProtImport"):
+                runName = prot.getRunName()
+                logger.info(f"Found protocol {runName}")
+                for f in prot.getOutputFiles():
+                    if ':' in f:
+                        f = f.split(':')[0]
+
+                    if not os.path.exists(f):
+                        logger.info(f"\tMissing link: {f}")
+
+                        if os.path.islink(f):
+                            sourceFile = os.path.realpath(f)
+                            newFile = pwutils.findFileRecursive(os.path.basename(sourceFile),
+                                                                searchDir)
+                            if newFile:
+                                counter += 1
+                                logger.info(f"\t\tCreating link: {f} -> {newFile}")
+                                pwutils.createAbsLink(newFile, f)
+
+        logger.info(f"Fixed {counter} broken links")
 
     @staticmethod
     def cleanProjectName(projectName):

pyworkflow/project/scripts/fix_links.py

@@ -3,12 +3,15 @@
 import sys
 import os
 import logging
-logging.basicConfig(level="INFO")
 
+from pyworkflow.config import Config
 from pyworkflow.project import Manager
 import pyworkflow.utils as pwutils
 
 
+logging.basicConfig(level=Config.SCIPION_LOG_LEVEL, format=Config.SCIPION_LOG_FORMAT)
+
+
 def usage(error):
     print("""
     ERROR: %s

pyworkflow/protocol/constants.py

@@ -84,4 +84,4 @@ UNKNOWN_JOBID = -1
 SIZE_1KB = 1024
 SIZE_1MB = SIZE_1KB * SIZE_1KB
 SIZE_1GB = SIZE_1MB * SIZE_1KB
-SIZE_1TB = SIZE_1GB * SIZE_1KB
+SIZE_1TB = SIZE_1GB * SIZE_1KB

pyworkflow/protocol/executor.py

@@ -39,6 +39,7 @@ import os
 
 import pyworkflow.utils.process as process
 from pyworkflow.utils.path import getParentFolder, removeExt
+from pyworkflow.constants import PLUGIN_MODULE_VAR, RUN_JOB_GPU_PARAM_SEARCH
 from . import constants as cts
 
 from .launch import _submit, UNKNOWN_JOBID, _checkJobStatus
@@ -59,16 +60,26 @@ class StepExecutor:
         """ Set protocol to append active jobs to its jobIds. """
         self.protocol = protocol
 
-    def runJob(self, log, programName, params,           
+    def getRunContext(self):
+        return {PLUGIN_MODULE_VAR: self.protocol.getPlugin().getName()}
+
+    def runJob(self, log, programName, params,
                numberOfMpi=1, numberOfThreads=1,
                env=None, cwd=None, executable=None):
         """ This function is a wrapper around runJob, 
         providing the host configuration. 
         """
         process.runJob(log, programName, params,
-                       numberOfMpi, numberOfThreads, 
+                       numberOfMpi, numberOfThreads,
                        self.hostConfig,
-                       env=env, cwd=cwd, gpuList=self.getGpuList(), executable=executable)
+                       env=env, cwd=cwd, gpuList=self._getGPUListForCommand(programName, params), executable=executable, context=self.protocol.getSubmitDict())
+
+    def _getGPUListForCommand(self, program, params):
+        """ Returns the list of GPUs if the program or the params have the GPU placeholder %(GPU)s """
+        if RUN_JOB_GPU_PARAM_SEARCH in params or RUN_JOB_GPU_PARAM_SEARCH in program:
+            return self.getGpuList()
+        else:
+            return []
 
     def _getRunnable(self, steps, n=1):
         """ Return the n steps that are 'new' and all its
@@ -258,7 +269,7 @@ class ThreadStepExecutor(StepExecutor):
 
             gpus = self.getFreeGpuSlot(nodeId)
             if gpus is None:
-                logger.warning("Step on node %s is requesting GPUs but there isn't any available. Review configuration of threads/GPUs. Returning and empty list." % nodeId)
+                logger.warning("Step on node %s is requesting GPUs but there isn't any available. Review configuration of threads/GPUs. Returning an empty list." % nodeId)
                 return []
             else:
                 return gpus
@@ -422,15 +433,20 @@ class QueueStepExecutor(ThreadStepExecutor):
         threadId = threading.current_thread().thId
         submitDict = dict(self.hostConfig.getQueuesDefault())
         submitDict.update(self.submitDict)
-        submitDict['JOB_COMMAND'] = process.buildRunCommand(programName, params, numberOfMpi,
-                                                            self.hostConfig, env,
-                                                            gpuList=self.getGpuList())
         threadJobId = self.getThreadJobId(threadId)
         subthreadId = '-%s-%s' % (threadId, threadJobId)
         submitDict['JOB_NAME'] = submitDict['JOB_NAME'] + subthreadId
         submitDict['JOB_SCRIPT'] = os.path.abspath(removeExt(submitDict['JOB_SCRIPT']) + subthreadId + ".job")
         submitDict['JOB_LOGS'] = os.path.join(getParentFolder(submitDict['JOB_SCRIPT']), submitDict['JOB_NAME'])
 
+        logger.debug("Variables available for replacement in submission command are: %s" % submitDict)
+
+        submitDict['JOB_COMMAND'] = process.buildRunCommand(programName, params, numberOfMpi,
+                                                            self.hostConfig, env,
+                                                            gpuList=self._getGPUListForCommand(programName, params),
+                                                            context=submitDict)
+
+
         jobid = _submit(self.hostConfig, submitDict, cwd, env)
         self.protocol.appendJobId(jobid)  # append active jobs
         self.protocol._store(self.protocol._jobId)

pyworkflow/protocol/hosts.py

@@ -36,6 +36,7 @@ from configparser import RawConfigParser
 from collections import OrderedDict
 
 import pyworkflow as pw
+from pyworkflow import PARALLEL_COMMAND_VAR
 from pyworkflow.object import Object, String, Integer
 
 
@@ -199,7 +200,7 @@ class HostConfig(Object):
                 # Read the address of the remote hosts,
                 # using 'localhost' as default for backward compatibility
                 host.setAddress(get('ADDRESS', 'localhost'))
-                host.mpiCommand.set(get('PARALLEL_COMMAND'))
+                host.mpiCommand.set(get(PARALLEL_COMMAND_VAR))
                 host.queueSystem = QueueSystemConfig()
                 hostQueue = host.queueSystem  # shortcut
                 hostQueue.name.set(get('NAME'))

pyworkflow/protocol/protocol.py

@@ -36,13 +36,15 @@ from pyworkflow.exceptions import ValidationException, PyworkflowException
 from pyworkflow.object import *
 import pyworkflow.utils as pwutils
 from pyworkflow.utils.log import getExtraLogInfo, STATUS, setDefaultLoggingContext
+from pyworkflow.constants import PLUGIN_MODULE_VAR, QUEUE_FOR_JOBS
 from .executor import StepExecutor, ThreadStepExecutor, QueueStepExecutor
 from .constants import *
-from .params import Form
+from .params import Form, IntParam
 from ..utils import getFileSize
 
 
 import  logging
+
 # Get the root logger
 logger = logging.getLogger(__name__)
 
@@ -67,6 +69,7 @@ class Step(Object):
 
     def needsGPU(self) -> bool:
         return self._needsGPU.get()
+
     def getIndex(self):
         return self._index
 
@@ -1117,10 +1120,7 @@ class Protocol(Step):
     def _getRelPathExecutionDir(self, *path):
         """ Return a relative path from the projdir. """
         # TODO  must be a bettis
-        return os.path.relpath(
-            self._getPath(*path),
-            os.path.dirname(os.path.dirname(self.workingDir.get()))
-        )
+        return os.path.relpath(self._getPath(*path), os.path.dirname(os.path.dirname(self.workingDir.get())))
 
     def _getBasePath(self, path):
         """ Take the basename of the path and get the path
@@ -1617,7 +1617,6 @@ class Protocol(Step):
                                         prot_id=self.getObjId(),
                                         prot_name=self.getClassName()))
 
-
     def getLogPaths(self):
         return [self.getStdoutLog(),self.getStderrLog() , self.getScheduleLog()]
 
@@ -1638,7 +1637,6 @@ class Protocol(Step):
         """ Return the steps.sqlite file under logs directory. """
         return self._getLogsPath('steps.sqlite')
 
-
     def _addChunk(self, txt, fmt=None):
         """
         Add text txt to self._buffer, with format fmt.
@@ -1921,21 +1919,26 @@ class Protocol(Step):
         queueName, queueParams = self.getQueueParams()
         hc = self.getHostConfig()
 
-        script = self._getLogsPath(hc.getSubmitPrefix() + self.strId() + '.job')
-        d = {'JOB_SCRIPT': script,
-             'JOB_LOGS': self._getLogsPath(hc.getSubmitPrefix() + self.strId()),
-             'JOB_NODEFILE': os.path.abspath(script.replace('.job', '.nodefile')),
-             'JOB_NAME': self.strId(),
+        d = {'JOB_NAME': self.strId(),
              'JOB_QUEUE': queueName,
              'JOB_NODES': self.numberOfMpi.get(),
              'JOB_THREADS': self.numberOfThreads.get(),
              'JOB_CORES': self.numberOfMpi.get() * self.numberOfThreads.get(),
              'JOB_HOURS': 72,
              'GPU_COUNT': len(self.getGpuList()),
-             'QUEUE_FOR_JOBS': 'N',
+             QUEUE_FOR_JOBS: 'N',
              'SCIPION_PROJECT': "SCIPION_PROJECT",  # self.getProject().getShortName(),
-             'SCIPION_PROTOCOL': self.getRunName()
+             'SCIPION_PROTOCOL': self.getRunName(),
+             PLUGIN_MODULE_VAR: self.getPlugin().getName()
              }
+
+        # Criteria in HostConfig.load to load or not QUEUE variables
+        if hc.getQueueSystem().hasName():
+            job_logs = self._getLogsPath(hc.getSubmitPrefix() + self.strId())
+            d['JOB_SCRIPT'] = job_logs + '.job'
+            d['JOB_LOGS'] = job_logs
+            d['JOB_NODEFILE'] = os.path.abspath(job_logs +'.nodefile')
+
         d.update(queueParams)
         return d
 
@@ -1946,12 +1949,12 @@ class Protocol(Step):
     def useQueueForSteps(self):
         """ This function will return True if the protocol has been set
         to be launched through a queue by steps """
-        return self.useQueue() and (self.getSubmitDict()["QUEUE_FOR_JOBS"] == "Y")
+        return self.useQueue() and (self.getSubmitDict()[QUEUE_FOR_JOBS] == "Y")
 
     def useQueueForProtocol(self):
         """ This function will return True if the protocol has been set
         to be launched through a queue """
-        return self.useQueue() and (self.getSubmitDict()["QUEUE_FOR_JOBS"] == "N")
+        return self.useQueue() and (self.getSubmitDict()[QUEUE_FOR_JOBS] != "Y")
 
     def getQueueParams(self):
         if self._queueParams.hasValue():
@@ -2441,6 +2444,11 @@ def runProtocolMain(projectPath, protDbPath, protId):
     setDefaultLoggingContext(protId, protocol.getProject().getShortName())
 
     hostConfig = protocol.getHostConfig()
+    gpuList = protocol.getGpuList()
+
+    #If queue is to be used
+    if protocol.useQueue():
+        gpuList = anonimizeGPUs(gpuList)
 
     # Create the steps executor
     executor = None
@@ -2451,18 +2459,18 @@ def runProtocolMain(projectPath, protDbPath, protId):
             executor = QueueStepExecutor(hostConfig,
                                          protocol.getSubmitDict(),
                                          nThreads - 1,
-                                         gpuList=protocol.getGpuList())
+                                         gpuList=gpuList)
         else:
             executor = ThreadStepExecutor(hostConfig, nThreads - 1,
-                                          gpuList=protocol.getGpuList())
+                                          gpuList=gpuList)
 
     if executor is None and protocol.useQueueForSteps():
         executor = QueueStepExecutor(hostConfig, protocol.getSubmitDict(), 1,
-                                     gpuList=protocol.getGpuList())
+                                     gpuList=gpuList)
 
     if executor is None:
         executor = StepExecutor(hostConfig,
-                                gpuList=protocol.getGpuList())
+                                gpuList=gpuList)
 
     logger.info("Running protocol using the %s executor." % executor)
     protocol.setStepsExecutor(executor)
@@ -2470,6 +2478,22 @@ def runProtocolMain(projectPath, protDbPath, protId):
     protocol.run()
 
 
+def anonimizeGPUs(gpuList):
+
+    renamedGPUs=dict()
+    anonimousGPUs = []
+
+    for gpu in gpuList:
+
+        if gpu not in renamedGPUs:
+            renamedGPUs[gpu] = len(renamedGPUs)
+
+        anonimousGPUs.append(renamedGPUs[gpu])
+
+    return anonimousGPUs
+
+
+
 def getProtocolFromDb(projectPath, protDbPath, protId, chdir=False):
     """ Retrieve the Protocol object from a given .sqlite file
     and the protocol id.
@@ -2535,6 +2559,7 @@ def isProtocolUpToDate(protocol):
 class ProtImportBase(Protocol):
     """ Base Import protocol"""
 
+
 class ProtStreamingBase(Protocol):
     """ Base protocol to implement streaming protocols.
     stepsGeneratorStep should be implemented (see its description) and output
@@ -2544,18 +2569,35 @@ class ProtStreamingBase(Protocol):
     """
 
     stepsExecutionMode = STEPS_PARALLEL
+
+    def _defineStreamingParams(self, form):
+        """ This function can be called during the _defineParams method
+        of some protocols that support stream processing.
+        It will add a Streaming section together with the following
+        params:
+            streamingSleepOnWait: Some streaming protocols are quite fast,
+                so, checking input/output updates creates an IO overhead.
+                This params allows them to sleep (without consuming resources)
+                to wait for new work to be done.
+        """
+        form.addSection("Streaming")
+        form.addParam("streamingSleepOnWait", IntParam, default=10,
+                      label="Sleep when waiting (secs)",
+                      help="If you specify a value greater than zero, "
+                           "it will be the number of seconds that the "
+                           "protocol will sleep when waiting for new "
+                           "input data in streaming mode. ")
+
     def _insertAllSteps(self):
-        # Insert the step that generates the steps
+        """ Insert the step that generates the steps """
         self._insertFunctionStep(self.resumableStepGeneratorStep, str(datetime.now()), needsGPU=False)
 
     def resumableStepGeneratorStep(self, ts):
-        """ This allow to resume protocols. ts is the time stamp so this stap is alway different form previous exceution"""
+        """ This allow to resume protocols. ts is the time stamp so this stap is always different form previous execution"""
         self.stepsGeneratorStep()
 
-
     def _stepsCheck(self):
-
-        # Just store steps created in checkNewInputStep
+        """ Just store steps created in checkNewInputStep"""
         if self._newSteps:
             self.updateSteps()
 
@@ -2569,11 +2611,28 @@ class ProtStreamingBase(Protocol):
         """
         pass
 
-    def _validateThreads(self, messages:list):
+    def _getStreamingSleepOnWait(self):
+        """ Retrieves the configured sleep duration for waiting during streaming.
+            Returns:
+            - int: The sleep duration in seconds during streaming wait.
+            """
+        return self.getAttributeValue('streamingSleepOnWait', 0)
+
+    def _streamingSleepOnWait(self):
+        """ This method should be used by protocols that want to sleep
+        when there is not more work to do.
+        """
+        sleepOnWait = self._getStreamingSleepOnWait()
+        if sleepOnWait > 0:
+            self.info("Waiting %s now before checking again for new input" % sleepOnWait)
+            time.sleep(sleepOnWait)
+
+    def _validateThreads(self, messages: list):
 
         if self.numberOfThreads.get() < 2:
             messages.append("At least 2 threads are needed for running this protocol. "
                             "1 for the 'stepsGenerator step' and one more for the actual processing" )
+
     def _validate(self):
         """ If you want to implement a validate method do it but call _validateThreads or validate threads value."""
         errors = []

pyworkflow/utils/process.py

@@ -37,15 +37,16 @@ import psutil
 
 from .utils import greenStr
 from pyworkflow import Config
+from pyworkflow.constants import PLUGIN_MODULE_VAR, PARALLEL_COMMAND_VAR, RUN_JOB_GPU_PARAM
 
 
 # The job should be launched from the working directory!
 def runJob(log, programname, params,           
            numberOfMpi=1, numberOfThreads=1, 
-           hostConfig=None, env=None, cwd=None, gpuList=None, executable=None):
+           hostConfig=None, env=None, cwd=None, gpuList=None, executable=None, context=dict()):
 
     command = buildRunCommand(programname, params, numberOfMpi, hostConfig,
-                              env, gpuList=gpuList)
+                              env, gpuList=gpuList,context=context)
     
     if log is None:
         log = logger
@@ -74,8 +75,10 @@ def runCommand(command, env=None, cwd=None, executable=None):
 
     
 def buildRunCommand(programname, params, numberOfMpi, hostConfig=None,
-                    env=None, gpuList=None):
-    """ Return a string with the command line to run """
+                    env=None, gpuList=None, context=dict()):
+    """ Return a string with the command line to run
+
+     :param context: a dictionary with extra context variable to make run command more flexible"""
 
     # Convert our list of params to a string, with each element escaped
     # with "" in case there are spaces.
@@ -83,10 +86,10 @@ def buildRunCommand(programname, params, numberOfMpi, hostConfig=None,
         params = ' '.join('"%s"' % p for p in params)
 
     if gpuList:
-        params = params % {'GPU': ' '.join(str(g) for g in gpuList)}
+        params = params % {RUN_JOB_GPU_PARAM: ' '.join(str(g) for g in gpuList)}
         if "CUDA_VISIBLE_DEVICES" in programname:
             sep = "," if len(gpuList) > 1 else ""
-            programname = programname % {'GPU': sep.join(str(g) for g in gpuList)}
+            programname = programname % {RUN_JOB_GPU_PARAM: sep.join(str(g) for g in gpuList)}
 
     prepend = '' if env is None else env.getPrepend()
 
@@ -100,10 +103,28 @@ def buildRunCommand(programname, params, numberOfMpi, hostConfig=None,
             
         mpiFlags = '' if env is None else env.get('SCIPION_MPI_FLAGS', '') 
 
-        mpiCmd = hostConfig.mpiCommand.get() % {
+        context.update({
             'JOB_NODES': numberOfMpi,
             'COMMAND': "%s `which %s` %s" % (mpiFlags, programname, params),
-        }
+        })
+        logger.debug("Context variables for mpi command are: %s" % context)
+
+        mpiCommand = hostConfig.mpiCommand.get()
+        pluginModule = context.get(PLUGIN_MODULE_VAR, None)
+
+        if pluginModule is not None:
+            custom_command_var = PARALLEL_COMMAND_VAR + "_" + pluginModule.upper()
+            if custom_command_var in env:
+                mpiCommand = env.get(custom_command_var)
+                logger.info("Custom mpi command for this plugin found. Using it.  %s: %s"
+                            % (custom_command_var, mpiCommand))
+            else:
+                logger.info("%s not found in the environment. Using default mpi command found in %s. %s: %s"
+                            % (custom_command_var, Config.SCIPION_HOSTS, PARALLEL_COMMAND_VAR, mpiCommand))
+
+
+        mpiCmd = mpiCommand % context
+
         return '%s %s' % (prepend, mpiCmd)
 
 

pyworkflowtests/objects.py

@@ -640,10 +640,10 @@ class MockSetOfImages(MockSet):
         """ Return the string representing the dimensions. """
         return str(self._firstDim)
 
-    def iterItems(self, orderBy='id', direction='ASC', where=None, limit=None):
+    def iterItems(self, orderBy='id', direction='ASC', where=None, limit=None, rowFilter=None):
         """ Redefine iteration to set the acquisition to images. """
         for img in pwobj.Set.iterItems(self, orderBy=orderBy, direction=direction,
-                                       where=where, limit=limit):
+                                       where=where, limit=limit, rowFilter=rowFilter):
 
             # Sometimes the images items in the set could
             # have the acquisition info per data row and we

pyworkflowtests/tests/test_protocol_execution.py

@@ -73,6 +73,13 @@ class TestProtocolExecution(pwtests.BaseTest):
         
         self.assertEqual(prot.endTime.get(), prot2.endTime.get())
 
+    def test_gpu_anonimization(self):
+
+        self.assertEqual(pwprot.anonimizeGPUs([0, 1, 2]),[0, 1, 2], "Anonimization of GPUs does not work")
+        self.assertEqual(pwprot.anonimizeGPUs([2, 1, 0]), [0, 1, 2], "Anonimization of GPUs does not work")
+        self.assertEqual(pwprot.anonimizeGPUs([2, 1, 2]), [0, 1, 0], "Anonimization of GPUs does not work")
+        self.assertEqual(pwprot.anonimizeGPUs([2, 1, 2, 4]), [0, 1, 0, 2], "Anonimization of GPUs does not work")
+
     def test_gpuSlots(self):
         """ Test gpu slots are properly composed in combination of threads"""
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: scipion-pyworkflow
-Version: 3.10.5
+Version: 3.10.6
 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
@@ -20,16 +20,26 @@ Classifier: Topic :: Scientific/Engineering
 License-File: LICENSE.txt
 Requires-Dist: bibtexparser<=1.4.1
 Requires-Dist: psutil<=5.9.6
-Requires-Dist: tkcolorpicker
-Requires-Dist: distro<=1.8
-Requires-Dist: importlib-metadata<=6.8.0
-Requires-Dist: matplotlib==3.7.3; python_version == "3.8"
-Requires-Dist: numpy==1.24.4; python_version == "3.8"
 Requires-Dist: configparser==6.0.0; python_version >= "3.8"
-Requires-Dist: pillow==10.1.0; python_version >= "3.8"
-Requires-Dist: requests==2.31.0; python_version >= "3.8"
+Requires-Dist: matplotlib==3.7.3; python_version == "3.8"
 Requires-Dist: matplotlib==3.8.1; python_version >= "3.9"
+Requires-Dist: pillow==10.1.0; python_version >= "3.8"
+Requires-Dist: numpy==1.24.4; python_version == "3.8"
 Requires-Dist: numpy==1.26.1; python_version >= "3.9"
+Requires-Dist: requests==2.31.0; python_version >= "3.8"
+Requires-Dist: tkcolorpicker
+Requires-Dist: distro<=1.8
+Requires-Dist: importlib-metadata<=6.8.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: project-url
+Dynamic: requires-dist
+Dynamic: summary
 
 .. image:: https://img.shields.io/pypi/v/scipion-pyworkflow.svg
         :target: https://pypi.python.org/pypi/scipion-pyworkflow

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

@@ -1,9 +1,9 @@
 pyworkflow/__init__.py,sha256=Wr-MVKMQJy_Cy-rpPPB0-pyv8-8tx7GPPaLSNBrV1AI,1246
 pyworkflow/config.py,sha256=_sq6YCRfcfE4WUNXLShgbICbBeTSLpD2KmPVapR1Wos,22306
-pyworkflow/constants.py,sha256=-3fJkkmdAhvEm5sXIXLEJI6VpE8Uhzhj2X3Sau732Y4,7448
+pyworkflow/constants.py,sha256=XJiTVSmA0jR8yYgxW-tMaWCPonXgn6P5KXI0__W8mtc,7758
 pyworkflow/exceptions.py,sha256=3VFxuNJHcIWxRnLPR0vYg0RFAQMmxPBJZLZSi87VI8E,507
-pyworkflow/object.py,sha256=yX3tBUuBssCI8aWGlTmyEKzFE59dJq_7NqllouVzMk0,55069
-pyworkflow/plugin.py,sha256=JJm5plPyOnPAR4To6I5rXVIBda-1Dg-53zicdnLSrac,28858
+pyworkflow/object.py,sha256=01nUr0Ud-EDVCULtElfC4patgxUYuUIbrI5qmCsC7BY,55149
+pyworkflow/plugin.py,sha256=UAwrx8xm0TkVx16q-jYqvCkYva021DdSWUTav4utJJo,28860
 pyworkflow/template.py,sha256=uScWMZCR3U6ishDlx7QGDDr8B_aLpKXoh8zOhqAirCY,10463
 pyworkflow/viewer.py,sha256=vA6VxYuxmCwMjIxCIdrp_G-R-nVo-0TA8p1rSl24EOY,11386
 pyworkflow/wizard.py,sha256=nXuk_qMUVlQNa6nB6GCt0CoFQ_P2dnJbGWdwtpDG2tQ,2633
@@ -22,7 +22,7 @@ pyworkflow/gui/__init__.py,sha256=D7PVYky81yTcqvkGEtw1CIxRkICpsn4TO5z5lJg84yM,13
 pyworkflow/gui/browser.py,sha256=Be4keeCLl32t5HzrqOdMhk_6oJ93Q5WX5FKy8iO9hYU,25590
 pyworkflow/gui/canvas.py,sha256=M_pD7QbqnYq9MY145WN6BYzeIAo0cIkbxLrZKNE80yg,42106
 pyworkflow/gui/dialog.py,sha256=35YpyOmUsmiVqdjU-k4AFDG7PKq0te4AUR-oTofhxEk,35329
-pyworkflow/gui/form.py,sha256=ho_HeqB4e4lPaM1WclVYzfYYMpnwZm_xYCRrlXDQf0E,104000
+pyworkflow/gui/form.py,sha256=_rqKWNx2tzyU5wg9mup3COo0edrGuzZ-sq29p-JZg0w,104007
 pyworkflow/gui/graph.py,sha256=HSZ5PfFKkhv3tzl0o9UtSU_FfDevKR2M3L9HgU9_Gkc,8747
 pyworkflow/gui/graph_layout.py,sha256=R9uTc_Ei4oWAeCkZ3d78JjC1QKV7HPJaDLyhvSfK7NE,9520
 pyworkflow/gui/gui.py,sha256=pEtBYo0bf5grDX8e6Ju920aSDGiWno85pxrSxcMrSTY,20627
@@ -37,7 +37,7 @@ pyworkflow/gui/project/base.py,sha256=N64UXy5ep7RFweyBWTDro9UESgKRRAIvlRuotWIaO_
 pyworkflow/gui/project/constants.py,sha256=rORDaNCdAFRFcBmjRt2PJ1cXpSmYgDLfbvrbqZh1Bb0,4943
 pyworkflow/gui/project/labels.py,sha256=7m4heNcN3zXe0BHuFJyQrPD5hC8LiHnlu1sizRc8l_Y,7680
 pyworkflow/gui/project/project.py,sha256=LgpwqnOIr6RPqBb76fOoWrPrpdBzQCQev7JuRLj4lEA,18852
-pyworkflow/gui/project/searchprotocol.py,sha256=xv1nDk7tigQ4M7SLc_ZqGY8c6kG1crjP_xCp9KJjVZ0,5753
+pyworkflow/gui/project/searchprotocol.py,sha256=5f3suNir_UNn2CIppmNoKHR0JZIfyuH7XRbEBaGVPsI,5762
 pyworkflow/gui/project/searchrun.py,sha256=xCGxs7L9PMk48ei9Gi3HI2PAOYEM-zXR5vRfAQRLHKI,7269
 pyworkflow/gui/project/steps.py,sha256=fq0WhPBoByFs8Lr-qmGZ-aFC4lx3XCF2zM2DOBd_KAc,6053
 pyworkflow/gui/project/utils.py,sha256=H9oFPzz9lAjAI4PRYSYyYniTBn98Y6YSs0bE0qXpMEM,11923
@@ -45,20 +45,20 @@ pyworkflow/gui/project/variables.py,sha256=UczW6yQqzssj3eETEKaae5GSpsWr04ItPrr5o
 pyworkflow/gui/project/viewdata.py,sha256=Xoxy1YTqKGSU2DUiM7j23gf-yv4ToNmX_zWgRpVZDo4,18187
 pyworkflow/gui/project/viewprojects.py,sha256=ZcWzfFLVeCKzVsFboxquzBsOagEoPW0CpVUQ8ZLpvQE,22516
 pyworkflow/gui/project/viewprotocols.py,sha256=sykimCQUHCUG5Irjr8__sIZJgJEzG-wgZb7SrdpzkVE,84014
-pyworkflow/gui/project/viewprotocols_extra.py,sha256=d3YZ3KAU8wMdn8psOvDxUDxcN0prruRNdb31bMa8_M0,21250
+pyworkflow/gui/project/viewprotocols_extra.py,sha256=fp7TKQtndw-b0c7GEbTox_w270eKNJnrFybgTCPOg1Q,21261
 pyworkflow/mapper/__init__.py,sha256=HM7tMMd1r2BZ8hbPGryUQ80E4evY46zIVjiZ3edg_Mg,1186
 pyworkflow/mapper/mapper.py,sha256=YGVlBK3btHL-jLID6v2jLy7Mb9Wu47lxfZjHdzz0hMg,7726
-pyworkflow/mapper/sqlite.py,sha256=II53wccWx7kRWLFEKyHKTyX9yr5Qz5-d_IxmSdgjdVc,65269
+pyworkflow/mapper/sqlite.py,sha256=ESOkr_whle59ECg-icgm8nAin9VMkgocwZSGUYxOgEY,65427
 pyworkflow/mapper/sqlite_db.py,sha256=HYSXe_fRX1NBKDs6l2zefdO4PMEajnoDMXPjmoFs8Kc,5602
 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=oBJYSzZyZesXpauMjRo2PyNCr9mYly5zWB8pb-jTSiw,83882
+pyworkflow/project/project.py,sha256=7o2XNmfgrXWRMkmyE2OfOkOB4CpQ4yPoipGz7BdW4I8,83532
 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
 pyworkflow/project/scripts/edit_workflow.py,sha256=AhwwEFjEgTRR8LUZ4tBSoY2jprDgUmmgFR3FcIU5uno,2940
-pyworkflow/project/scripts/fix_links.py,sha256=i6hRbczKk3A6GpRtBSp357nT4p7fdbW84enaPx0ueAI,958
+pyworkflow/project/scripts/fix_links.py,sha256=u6UXXqIIh-Rq8FYPmmtvcrgPdszPt93LnkVv0xowAEY,1049
 pyworkflow/project/scripts/load.py,sha256=oA_xZjO94N-hZohLZQXBKEdmE7BZuWxH7x9gPx9lMj8,2696
 pyworkflow/project/scripts/refresh.py,sha256=-uw41ouFgEzIF4iBXFRzAI79Lna7fqMmEKhRciSUpTA,2603
 pyworkflow/project/scripts/schedule.py,sha256=mUUlaUSiMvA_skES6WOL0Mg-j7-S9Cx6dN-6wx5ZM6Y,3989
@@ -66,13 +66,13 @@ pyworkflow/project/scripts/stack2volume.py,sha256=ZV8qtPj4qWg2LJSXHBnx-S8L8pyGGQ
 pyworkflow/project/scripts/stop.py,sha256=vCeCxkwPCoUkLbna5HCxKWJ1hrsI4U19Sg9JD4ksXj8,2427
 pyworkflow/protocol/__init__.py,sha256=bAdIpvUW4GAYdIuv92DZ44-OEkZ7lTtnp1S9T5cwtVs,1413
 pyworkflow/protocol/bibtex.py,sha256=mCUk1Hp5Vp_i2lozDM1BQNOw10e_RSu86oXvrR63sOA,2122
-pyworkflow/protocol/constants.py,sha256=DfuCs7eub-mLHJjEpHlIG9BW3fUpRwfTVwMYytNWv6U,3392
-pyworkflow/protocol/executor.py,sha256=qWm5Baf8snMzS0DyvjeyPIBPqkYgfiRqDOUt_8kqTYg,17960
-pyworkflow/protocol/hosts.py,sha256=B9ENNclqYe75CPqAMOoPjwn-r3ST6HxTewXtsK_zWks,10453
+pyworkflow/protocol/constants.py,sha256=gyYtGFjfZbyAi2nDK6YpIRq6baZIJc_EdPD3oP2VdNM,3391
+pyworkflow/protocol/executor.py,sha256=3f1lZ0Y3ahv7BOkQJLsghJG7vtx30p2BhlttLE7XHx8,18728
+pyworkflow/protocol/hosts.py,sha256=fk2RpLL0E6wPphSTr0zl1enq-MHtTAKLQaWq_6cbcZw,10499
 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=YX8C02zfhLCTJPIz8NgZozXPQiKn5IqEXoyyZAHzPLI,97552
+pyworkflow/protocol/protocol.py,sha256=48x-NleLfKxrzYIz13rZ1EsWa74vlomNZdd54mEIvuw,99724
 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
@@ -103,7 +103,7 @@ pyworkflow/utils/echo.py,sha256=ZXJRrmxUaTT4Xxf7_pQwg7Th341iFafTs66VEKNOZmE,3442
 pyworkflow/utils/graph.py,sha256=z3Hcj0I38du97DQEqNT5gk--SCDTRPlKotaCszoZfX8,4981
 pyworkflow/utils/log.py,sha256=8SIg1jwOKMQzGgDqutB7ZD42ZzLHslxULPvK-f1sDD0,10693
 pyworkflow/utils/path.py,sha256=hDisc13HhfB6CxpBcI1JBd5er_S6yVTKw1MFSw1AR3U,16803
-pyworkflow/utils/process.py,sha256=m6gZ_9vHTJyzXOCGGIIwFCbXXoH7XC-Okn5SJzs1P1U,4717
+pyworkflow/utils/process.py,sha256=6l4Mf6C3nyYMeLBQxbrGaAWWmJvf6zQuTLQzPYQVxPU,5790
 pyworkflow/utils/profiler.py,sha256=BC0KkAgfYqf-CV40zLcRxo5Td79f5jw1gzvaDH8iqt8,2218
 pyworkflow/utils/progressbar.py,sha256=VntEF_FTdQHjMKawfR1R4IoNgYNTEMmnLUIDvUXurxk,5903
 pyworkflow/utils/properties.py,sha256=D1LHkVn0cbxCHhedJE4XAw5ZwOufb_4z48IeJ0L0fWc,23960
@@ -117,7 +117,7 @@ pyworkflow/webservices/repository.py,sha256=Hw2ZhvuJzKbN5ivTuN2gTNeJT49Q3-PuM9Bd
 pyworkflow/webservices/workflowhub.py,sha256=hA4RETMXmxUF-l605INS1TCT2nWnUwOIjrYKzRUZVLQ,2179
 pyworkflowtests/__init__.py,sha256=RoXNgyShL7moVEXaimTDdfY1fU26dgGKtdjO4JfBQOk,1686
 pyworkflowtests/bibtex.py,sha256=1f9PjkRO937PB2b-ax-eKLwjU4YY11M5px3dk3xWQzw,2102
-pyworkflowtests/objects.py,sha256=f4lRHxKg6A23tAhF-8qHXslDPaHBdy4qk72TfR5g_dg,26651
+pyworkflowtests/objects.py,sha256=uaD9THeybiCkUDbb_cpqEwqCpVG3RLyMsIjOKOX7oNQ,26688
 pyworkflowtests/protocols.py,sha256=gSCtA5IuG0a_rvAjZ8uZQIxOr6gmrjfvaaqFnpGY2ds,5529
 pyworkflowtests/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyworkflowtests/tests/test_canvas.py,sha256=_d3Xccp7BuwdbkNC5cTTNVXH425V4k1hKYuhUsn4JtU,2685
@@ -126,15 +126,15 @@ pyworkflowtests/tests/test_logs.py,sha256=lNHPtvPIWk_nRy3L3B2GriroMwgNmTZ_-RHRw0
 pyworkflowtests/tests/test_mappers.py,sha256=2DBzZaM8rIKQTSU9xWAsNGwZkpUPB1FBwgwMmNNbVkg,15423
 pyworkflowtests/tests/test_object.py,sha256=WVWP11oXNeOTUDJ5BLFR32MmQi6C5Y6KjfVRBf9fu3w,18577
 pyworkflowtests/tests/test_project.py,sha256=RBrhpIs45dWLrciHqzpj4ORyLZCNvjm8fytIolOZ9Ko,1685
-pyworkflowtests/tests/test_protocol_execution.py,sha256=uOokU-bgbd-1GqnEKNPcr02vJsAJvjHQ7I3vXNH9jCw,5081
+pyworkflowtests/tests/test_protocol_execution.py,sha256=mawHqMjzxZH-sbHapKR2sk5WRlMrBs5UQXIbqGSiVPM,5558
 pyworkflowtests/tests/test_protocol_export.py,sha256=z18nKPkOnrYLMU8KqcnVsF6-ylQ8d9mw-qFJWRn4Qdw,3291
 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.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.6.dist-info/licenses/LICENSE.txt,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+scipion_pyworkflow-3.10.6.dist-info/METADATA,sha256=jkbWXYBuW00lIHyLX9lCm1AfBL6-0NvxDHVeVoA1Cx8,4881
+scipion_pyworkflow-3.10.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+scipion_pyworkflow-3.10.6.dist-info/dependency_links.txt,sha256=D7r_CPRjYRtBb3q_OBocTdsaeXI5TwnYMu5ri0JFtzs,84
+scipion_pyworkflow-3.10.6.dist-info/entry_points.txt,sha256=-P6GVocWl_NS8wS7lB-bTKf-tKANbw4n7DlXXh_VrWk,54
+scipion_pyworkflow-3.10.6.dist-info/top_level.txt,sha256=PzyJteyenJwLjAeSFP7oYrTN_U71GABQwET8oLZkh9k,27
+scipion_pyworkflow-3.10.6.dist-info/RECORD,,

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

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

scipion_pyworkflow-3.10.6.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[pyworkflow.plugin]
+pyworkflowtests = pyworkflowtests

scipion_pyworkflow-3.10.5.dist-info/entry_points.txt

@@ -1,5 +0,0 @@
-[console_scripts]
-fix_links = pyworkflow.project.scripts.fix_links:main
-
-[pyworkflow.plugin]
-pyworkflowtests = pyworkflowtests