tomwer 1.2.0a1__py3-none-any.whl → 1.2.0a3__py3-none-any.whl

tomwer/third_party/nabu/preproc/phase.py

@@ -1,13 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from bisect import bisect
-from math import pi
-
 import numpy as np
-from silx.utils.enum import Enum as _Enum
-
+from math import pi
+from bisect import bisect
 from ..utils import generate_powers
+from silx.utils.enum import Enum as _Enum
 
 
 def lmicron_to_db(Lmicron, energy, distance):
@@ -222,7 +220,7 @@ class PaganinPhaseRetrieval(object):
         except ValueError:
             raise ValueError("Expected margin in the format ((U, D), (L, R))")
         for val in [U, D, L, R]:
-            if type(val) == str and val != "auto":
+            if type(val) is str and val != "auto":
                 raise ValueError("Expected either an integer, or 'auto'")
             if int(val) != val or val < 0:
                 raise ValueError("Expected positive integers for margin values")
@@ -361,9 +359,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(
-                f"Unknown padding method {padding_method}. Available are: {valid_padding_modes}"
+                "Unknown padding method %s. Available are: %s"
+                % (padding_method, str(list(self.padding_methods.keys())))
             )
         pad_func = self.padding_methods[padding_method]
         pad_func(data)

tomwer/third_party/nabu/utils.py

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

tomwer/version.py

@@ -79,7 +79,7 @@ MAJOR = 1
 MINOR = 2
 MICRO = 0
 RELEV = "alpha"  # <16
-SERIAL = 1  # <16
+SERIAL = 3  # <16
 
 date = __date__
 

{tomwer-1.2.0a1.dist-info → tomwer-1.2.0a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.2.0a1
+Version: 1.2.0a3
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -25,13 +25,13 @@ Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: psutil
 Requires-Dist: silx (>=1.0)
-Requires-Dist: tomoscan (>=1.3a)
-Requires-Dist: nxtomomill (>=0.12.2)
-Requires-Dist: processview (>=1.2)
+Requires-Dist: tomoscan (<2.0,>=1.3.0a4)
+Requires-Dist: nxtomomill (<1.0,>=0.12.2)
+Requires-Dist: processview (>=1.3)
 Requires-Dist: ewoks (>=0.1.1)
 Requires-Dist: sluurp (>=0.2.2)
 Requires-Dist: packaging
-Requires-Dist: flufl.lock
+Requires-Dist: flufl-lock
 Provides-Extra: _dev_spec
 Requires-Dist: black ; extra == '_dev_spec'
 Requires-Dist: flake8 ; extra == '_dev_spec'
@@ -204,44 +204,14 @@ It contains:
 Documentation
 -------------
 
-Documentation of latest release is available at http://www.edna-site.org/pub/doc/tomwer/latest
+`Latest documentation <https://tomotools.gitlab-pages.esrf.fr/tomwer/>`_
+
 
 Installation
 ------------
 
-Step 1 - Create a virtual env (recommended)
-'''''''''''''''''''''''''''''''''''''''''''
-
-It is recommended to create a python virtual environment to run the workflow tool.
-Virtual environment might avoid some conflict between python packages. But you can also install it on your 'current' python environment and move to step 1.
-
-.. code-block:: bash
-
-   virtualenv --python=python3 --system-site-packages myvirtualenv
-
-
-Then activate the virtual environment
-
-.. code-block:: bash
-
-   source myvirtualenv/bin/activate
-
-First update pip and setuptools to avoid some potential errors
-
-.. code-block:: bash
-
-   pip install --upgrade pip
-   pip install setuptools --upgrade
-
-
-.. note:: To quit the virtual environment
-
-   .. code-block:: bash
-
-      deactivate
-
-Step 2 - tomwer (madatory)
-''''''''''''''''''''''''''
+Step 1 - tomwer
+'''''''''''''''
 
 To install it with all 'features':
 
@@ -256,15 +226,15 @@ alternatively you can install the master branch from
     pip install git+https://gitlab.esrf.fr/tomotools/tomwer/#egg=tomwer[full]
 
 
-Step 3 - update orange-canvas-core and orange-widget-base (recommended)
-'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+Step 2 - update orange-canvas-core and orange-widget-base (Optional)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
-To access 'processing' wheels you might want to install forks of update orange-canvas-core and orange-widget-base
+To access 'processing' wheels and 'reprocess action' you might want to install forks of update orange-canvas-core and orange-widget-base. This is optional and projects works with native orange projects
 
 .. code-block:: bash
 
-    pip install https://github.com/payno/orange-canvas-core --no-deps --upgrade
-    pip install https://github.com/payno/orange-widget-base --no-deps --upgrade
+    pip install git+https://github.com/payno/orange-canvas-core --no-deps --upgrade
+    pip install git+https://github.com/payno/orange-widget-base --no-deps --upgrade
 
 
 Launching applications
@@ -310,8 +280,7 @@ Documentation
 
 .. code-block:: bash
 
-   cd doc
-   make html
+   sphinx-build doc build/html
 
 The documentation is build in doc/build/html and the entry point is index.html
 
@@ -320,11 +289,3 @@ The documentation is build in doc/build/html and the entry point is index.html
    firefox build/html/index.html
 
 .. note:: the build of the documentation need sphinx to be installed. This is not an hard dependacy. So you might need to install it.
-
-
-You also should generate documentation to be accessible from Orange GUI (pressing the F1 key).
-
-.. code-block:: bash
-
-   cd doc
-   make htmlhelp