Merge pull request #413 from scipion-em/devel

fix deps
scipion-em · Jul 8, 2024 · 11fe5f1 · 11fe5f1
2 parents cbda1cb + 255965d
commit 11fe5f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/relion/__init__.py b/relion/__init__.py
@@ -33,7 +33,7 @@
 from .constants import *
 
 
-__version__ = '5.0.0b7'
+__version__ = '5.0.0b8'
 _logo = "relion_logo.jpg"
 _references = ['Scheres2012a', 'Scheres2012b', 'Kimanius2016',
                'Zivanov2018', 'Kimanius2021']

diff --git a/relion/protocols/protocol_compress_movies_tasks.py b/relion/protocols/protocol_compress_movies_tasks.py
@@ -26,7 +26,8 @@
 
 import os
 
-from emtools.utils import Timer, Pipeline, Pretty
+from emtools.utils import Timer, Pretty
+from emtools.jobs import Pipeline
 from emtools.pwx import SetMonitor, BatchManager
 from emtools.metadata import StarFile, Table
 

diff --git a/setup.py b/setup.py
@@ -143,7 +143,7 @@
     #
     # For an analysis of "install_requires" vs pip's requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=['scipion-em', 'emtable>=0.0.14', 'emtools>=0.0.11'],  # Optional
+    install_requires=['scipion-em', 'emtable>=0.0.14', 'emtools>=0.1.0'],  # Optional
 
     # List additional groups of dependencies here (e.g. development
     # dependencies). Users will be able to install these using the "extras"