tomwer 1.1.1__py3-none-any.whl → 1.2.0a0__py3-none-any.whl

tomwer/synctools/stacks/reconstruction/sadeltabeta.py

@@ -27,22 +27,24 @@ __license__ = "MIT"
 __date__ = "08/06/2021"
 
 
-from processview.core.manager import ProcessManager
-from tomwer.synctools.sadeltabeta import QSADeltaBetaParams
-from tomwer.synctools.axis import QAxisRP
-from tomwer.core.scan.scanbase import TomwerScanBase
+import functools
+import logging
+
+from processview.core.manager import DatasetState, ProcessManager
+from processview.core.superviseprocess import SuperviseProcess
+from silx.gui import qt
+
 from tomwer.core.process.reconstruction.sadeltabeta.sadeltabeta import (
     SADeltaBetaProcess,
 )
+from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.settings import get_lbsram_path, isOnLbsram
 from tomwer.core.utils import isLowOnMemory
-from processview.core.manager import DatasetState
-from ..processingstack import FIFO, ProcessingThread
-from processview.core.superviseprocess import SuperviseProcess
 from tomwer.io.utils import format_stderr_stdout
-from silx.gui import qt
-import logging
-import functools
+from tomwer.synctools.axis import QAxisRP
+from tomwer.synctools.sadeltabeta import QSADeltaBetaParams
+
+from ..processingstack import FIFO, ProcessingThread
 
 _logger = logging.getLogger(__name__)
 
@@ -70,7 +72,7 @@ class SADeltaBetaProcessStack(FIFO, qt.QObject):
             process=self,
             state=DatasetState.ON_GOING,
         )
-        _logger.processStarted("start sa-delta-beta {}" "".format(str(data)))
+        _logger.processStarted(f"start sa-delta-beta {data}")
         assert isinstance(data, TomwerScanBase)
         if data.axis_params is None:
             data.axis_params = QAxisRP()
@@ -80,7 +82,7 @@ class SADeltaBetaProcessStack(FIFO, qt.QObject):
         sa_delta_beta_params = QSADeltaBetaParams.from_dict(configuration)
         if isOnLbsram(data) and isLowOnMemory(get_lbsram_path()) is True:
             # if computer is running into low memory on lbsram skip it
-            mess = "low memory, skip sa-delta-beta-axis calculation", data.path
+            mess = f"low memory, skip sa-delta-beta-axis calculation {data.path}"
             ProcessManager().notify_dataset_state(
                 dataset=data, process=self._process_id, state=DatasetState.SKIPPED
             )
@@ -176,10 +178,10 @@ class _ProcessingThread(ProcessingThread, SuperviseProcess):
                 sa_delta_beta.run()
             except Exception as e:
                 _logger.error(str(e))
-                mess = "SADeltaBeta computation for {} failed.".format(str(self._scan))
+                mess = f"SADeltaBeta computation for {self._scan} failed."
                 state = DatasetState.FAILED
             else:
-                mess = "SADeltaBeta computation for {} succeed.".format(str(self._scan))
+                mess = f"SADeltaBeta computation for {self._scan} succeed."
                 state = DatasetState.WAIT_USER_VALIDATION
                 self.db_value = self._scan.sa_delta_beta_params.autofocus
 

tomwer/synctools/test/test_darkRefs.py

@@ -31,14 +31,15 @@ __date__ = "11/12/2017"
 import os
 import shutil
 import tempfile
+
 import fabio
 import numpy
 from silx.gui.utils.testutils import TestCaseQt
-from tomwer.core.utils.scanutils import MockEDF
+
 from tomwer.core.process.reconstruction.darkref.darkrefs import DarkRefs
-from tomwer.core.process.reconstruction.darkref.params import DKRFRP
-from tomwer.core.process.reconstruction.darkref.params import ReduceMethod
+from tomwer.core.process.reconstruction.darkref.params import DKRFRP, ReduceMethod
 from tomwer.core.scan.scanfactory import ScanFactory
+from tomwer.core.utils.scanutils import MockEDF
 from tomwer.tests.utils import UtilsTest
 
 

tomwer/synctools/test/test_foldertransfer.py

@@ -28,22 +28,24 @@ __license__ = "MIT"
 __date__ = "24/01/2017"
 
 
-from tomwer.synctools.datatransfert import ScanTransfer
+import logging
+import os
+import shutil
+import tempfile
+import unittest
+from glob import glob
+
+import pytest
+from nxtomomill.converter import from_h5_to_nx
+from nxtomomill.io.config.hdf5config import TomoHDF5Config
+from silx.gui.utils.testutils import TestCaseQt
+
+from tomwer.core.scan.hdf5scan import HDF5TomoScan
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.utils import rebaseParFile
 from tomwer.core.utils.scanutils import MockEDF
+from tomwer.synctools.datatransfert import ScanTransfer
 from tomwer.tests.utils import UtilsTest
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
-from nxtomomill.converter import from_h5_to_nx
-from nxtomomill.io.config.hdf5config import TomoHDF5Config
-from silx.gui.utils.testutils import TestCaseQt
-from glob import glob
-import unittest
-import os
-import tempfile
-import shutil
-import logging
-import pytest
 
 try:
     from tomwer.synctools.rsyncmanager import RSyncManager

tomwer/synctools/test/test_scanstages.py

@@ -28,18 +28,19 @@ __license__ = "MIT"
 __date__ = "30/09/2019"
 
 
-import unittest
-import tempfile
+import glob
 import os
 import shutil
-import glob
+import tempfile
+import unittest
 from collections import namedtuple
-from tomwer.tests.utils import UtilsTest
-from tomwer.synctools.utils.scanstages import ScanStages
-from tomwer.core.scan.scanfactory import ScanFactory
-from tomwer.tests.utils import skip_gui_test
+
 import pytest
 
+from tomwer.core.scan.scanfactory import ScanFactory
+from tomwer.synctools.utils.scanstages import ScanStages
+from tomwer.tests.utils import UtilsTest, skip_gui_test
+
 if skip_gui_test() is False:
     from tomwer.synctools.rsyncmanager import RSyncManager
 

tomwer/synctools/utils/scanstages.py

@@ -30,14 +30,16 @@ __license__ = "MIT"
 __date__ = "09/01/2020"
 
 
-import shutil
 import glob
-from tomwer.core.scan.scanbase import TomwerScanBase
+import os
+import shutil
+
+from silx.io.url import DataUrl
+from silx.utils.enum import Enum as _Enum
+
 from tomwer.core.scan.edfscan import EDFTomoScan
 from tomwer.core.scan.hdf5scan import HDF5TomoScan
-from silx.utils.enum import Enum as _Enum
-from silx.io.url import DataUrl
-import os
+from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.synctools.rsyncmanager import RSyncManager
 
 

tomwer/tests/conftest.py

@@ -1,8 +1,8 @@
-import pytest
-from ewoksorange.bindings.qtapp import qtapp_context
-from ewoksorange.bindings.qtapp import get_all_qtwidgets
-import logging
 import gc
+import logging
+
+import pytest
+from ewoksorange.bindings.qtapp import get_all_qtwidgets, qtapp_context
 
 _logger = logging.getLogger(__name__)
 

tomwer/tests/test_scripts.py

@@ -33,10 +33,11 @@ __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 __date__ = "21/02/2018"
 
 
-import sys
-import unittest
 import logging
 import subprocess
+import sys
+import unittest
+
 from tomwer.tests.utils.utilstest import UtilsTest
 
 _logger = logging.getLogger(__name__)

tomwer/tests/utils/__init__.py

@@ -33,11 +33,12 @@ __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 __date__ = "07/02/2017"
 
+import fileinput
+import logging
 import os
 import shutil
-import fileinput
+
 from tomwer.core.utils import DownloadDataset, url_base
-import logging
 
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
@@ -186,8 +187,8 @@ class UtilsTest(object):
         if "TOMWER_ADDITIONAL_TESTS_DIR" not in os.environ:
             return False
         else:
-            dir = os.path.join(os.environ["TOMWER_ADDITIONAL_TESTS_DIR"], dataset)
-        return os.path.isdir(dir)
+            dir_ = os.path.join(os.environ["TOMWER_ADDITIONAL_TESTS_DIR"], dataset)
+        return os.path.isdir(dir_)
 
     @classmethod
     def getInternalTestDir(cls, dataset):

tomwer/tests/utils/utilstest.py

@@ -30,17 +30,16 @@ __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
 __date__ = "24/01/2018"
 
+import getpass
+import logging
 import os
+import shutil
 import sys
+import tempfile
 import threading
 import unittest
-import logging
-import shutil
-import tempfile
-import getpass
-
-
 from argparse import ArgumentParser
+
 from silx.resources import ExternalResources
 
 PACKAGE = "pyFAI"

tomwer/third_party/nabu/preproc/phase.py

@@ -1,12 +1,14 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import numpy as np
-from math import pi
 from bisect import bisect
-from ..utils import generate_powers
+from math import pi
+
+import numpy as np
 from silx.utils.enum import Enum as _Enum
 
+from ..utils import generate_powers
+
 
 def lmicron_to_db(Lmicron, energy, distance):
     """
@@ -359,9 +361,9 @@ class PaganinPhaseRetrieval(object):
         padding_method = padding_method or self.padding
         padding_method = PaddingMode.from_value(padding_method)
         if padding_method not in self.padding_methods:
+            valid_padding_modes = list(self.padding_methods.keys())
             raise ValueError(
-                "Unknown padding method %s. Available are: %s"
-                % (padding_method, str(list(self.padding_methods.keys())))
+                f"Unknown padding method {padding_method}. Available are: {valid_padding_modes}"
             )
         pad_func = self.padding_methods[padding_method]
         pad_func(data)

tomwer/third_party/nabu/utils.py

@@ -1,7 +1,8 @@
 import os
-import numpy as np
-from time import time
 from itertools import product
+from time import time
+
+import numpy as np
 
 _warnings = {}
 

tomwer/utils.py

@@ -22,6 +22,9 @@
 # THE SOFTWARE.
 #
 # ###########################################################################*/
+"""
+some project general utils functions
+"""
 
 __authors__ = ["H. Payno", "T. Vincent"]
 __license__ = "MIT"
@@ -30,19 +33,16 @@ __date__ = "04/01/2018"
 
 import argparse
 import functools
+import importlib
+import logging
+import sys
+
 from silx.utils.launcher import Launcher as _Launcher
 from silx.utils.launcher import LauncherCommand as _LauncherCommand
-import sys
-import logging
-import importlib
 
 _logger = logging.getLogger(__file__)
 
 
-def addHTMLLine(txt):
-    return "<li>" + txt + "</li>"
-
-
 def _docstring(dest, origin):
     """Implementation of docstring decorator.
 
@@ -202,12 +202,12 @@ class Launcher(_Launcher):
             return 0
 
         if command_name not in self._commands:
-            print("Unknown command: %s", command_name)
+            print(f"Unknown command: {command_name}")
             self.print_help()
             return -1
 
         command = self._commands[command_name]
-        prog = "%s %s" % (self.prog, command.name)
+        prog = f"{self.prog} {command.name}"
         return command.execute([prog, "--help"])
 
     def execute(self, argv=None):
@@ -228,7 +228,7 @@ class Launcher(_Launcher):
         command_name = argv[1]
 
         if command_name == "--version":
-            print("%s version %s" % (self.prog, str(self.version)))
+            print(f"{self.prog} version {str(self.version)}")
             return 0
 
         if command_name in ["--help", "-h"]:
@@ -239,10 +239,10 @@ class Launcher(_Launcher):
             else:
                 command_name = argv[2]
                 command_argv = argv[2:] + ["--help"]
-                command_argv[0] = "%s %s" % (self.prog, command_argv[0])
+                command_argv[0] = f"{self.prog} {command_argv[0]}"
         else:
             command_argv = argv[1:]
-            command_argv[0] = "%s %s" % (self.prog, command_argv[0])
+            command_argv[0] = f"{self.prog} {command_argv[0]}"
 
         if command_name not in self._commands:
             print("Unknown command: %s" % command_name)

tomwer/version.py

@@ -76,10 +76,10 @@ RELEASE_LEVEL_VALUE = {
 }
 
 MAJOR = 1
-MINOR = 1
-MICRO = 1
-RELEV = "final"  # <16
-SERIAL = 7  # <16
+MINOR = 2
+MICRO = 0
+RELEV = "alpha"  # <16
+SERIAL = 0  # <16
 
 date = __date__
 

{tomwer-1.1.1.dist-info → tomwer-1.2.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.1.1
+Version: 1.2.0a0
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -28,7 +28,7 @@ Requires-Dist: tomoscan (>=1.1.2)
 Requires-Dist: nxtomomill (>=0.12.2)
 Requires-Dist: processview (>=1.1)
 Requires-Dist: ewoks (>=0.1.1)
-Requires-Dist: sluurp (>=0.1)
+Requires-Dist: sluurp (>=0.2.1)
 Requires-Dist: packaging
 Provides-Extra: _dev_spec
 Requires-Dist: black ; extra == '_dev_spec'