Merge pull request #7 from 3dem/devel

Minor release 0.0.11
3dem · Mar 3, 2024 · dc5b4c8 · dc5b4c8
2 parents 6cb44b3 + b69c53e
commit dc5b4c8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/publish_and_tag.yml b/.github/workflows/publish_and_tag.yml
@@ -27,8 +27,8 @@ jobs:
         pip install setuptools wheel twine
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        TWINE_USERNAME: ${{ __token__ }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_JMRT_TOKEN }}
       run: |
         python setup.py sdist bdist_wheel
         twine upload dist/*

diff --git a/emtools/__init__.py b/emtools/__init__.py
@@ -24,5 +24,5 @@
 # *
 # **************************************************************************
 
-__version__ = '0.0.10'
+__version__ = '0.0.11'
 
diff --git a/emtools/pwx/monitors.py b/emtools/pwx/monitors.py
@@ -123,6 +123,7 @@ def __init__(self, SetClass, filename, *args, **kwargs):
         self._filename = filename
         self.lastUpdate = None
         self.streamClosed = None
+        self.inputCount = 0  # Count all input elements
 
         # Black list some items to not be monitored again
         # We are not interested in the items but just skip them from
@@ -141,6 +142,7 @@ def update(self):
             setInstance = self._SetClass(filename=self._filename)
             setInstance.loadAllProperties()
             for item in setInstance.iterItems():
+                self.inputCount += 1
                 iid = item.getObjId()
                 if iid not in self:
                     itemClone = item.clone()
@@ -170,10 +172,10 @@ def iterProtocolInput(self, prot, label, waitSecs=60):
         else:
             prot.info(f"No output {label}.")
 
-        for newMovie in self.newItems(sleep=waitSecs):
-            yield newMovie
+        for newItem in self.newItems(sleep=waitSecs):
+            yield newItem
 
-        prot.info(f"No more movies, stream closed. Total: {len(self)}")
+        prot.info(f"No more {label}, stream closed. Total: {len(self)}")
 
 
 class BatchManager:

diff --git a/emtools/scripts/emt-scipion-otf.py b/emtools/scripts/emt-scipion-otf.py
@@ -431,7 +431,7 @@ def continue_project(workingDir):
         print(f"Run {run.getObjId()}: {clsName}")
         if clsName == 'ProtRelionExtractParticles':
             protExtract = run
-        elif clsName == 'SphireProtCRYOLOPicking':
+        elif clsName.startswith('SphireProtCRYOLOPicking'):
             protCryolo = run
 
     if not protExtract.isActive():
@@ -629,7 +629,11 @@ def _get_keys(tokens):
                 protPicking = prot
 
     if protCtf:
-        ctfs = protCtf.outputCTF
+        if hasattr(protCtf, 'outputCTF'):
+            ctfs = protCtf.outputCTF
+        else: 
+            ctfs = protCtf.outputSet  # case of union, FIXME: validate other non-valid
+
         print_prot(protCtf, label='CTF protocol')
         print(f"            CTFs: {ctfs.getSize()}")
         write_micrographs_star('micrographs_ctf.star', ctfs)