tomwer 1.3.21__tar.gz → 1.3.23__tar.gz

{tomwer-1.3.21/tomwer.egg-info → tomwer-1.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.21
+Version: 1.3.23
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -27,7 +27,7 @@ Requires-Dist: psutil
 Requires-Dist: silx[full]>=2.0
 Requires-Dist: tomoscan>=2.0.0a11
 Requires-Dist: nxtomo<1.3,>=1.2.3rc1
-Requires-Dist: nxtomomill>=1.0dev
+Requires-Dist: nxtomomill<1.1,>=1.0dev
 Requires-Dist: processview>=1.3
 Requires-Dist: ewoks>=0.1.1
 Requires-Dist: ewoksorange<0.7,>=0.6

{tomwer-1.3.21 → tomwer-1.3.23}/setup.cfg

@@ -34,7 +34,7 @@ install_requires =
 	silx[full] >= 2.0
 	tomoscan>=2.0.0a11
 	nxtomo>=1.2.3rc1, <1.3
-	nxtomomill>=1.0dev
+	nxtomomill>=1.0dev, <1.1
 	processview>=1.3
 	ewoks>=0.1.1
 	ewoksorange >=0.6, <0.7
@@ -90,7 +90,7 @@ orangecontrib.tomwer =
 	widgets/other/icons/*.svg
 
 [options.extras_require]
-_full_base = 
+full_base = 
 	ewoks[orange]>=0.1.1
 	rsyncmanager
 	graypy
@@ -107,12 +107,12 @@ _full_base =
 	hdf5plugin
 	pyicat_plus
 full_no_nabu = 
-	%(_full_base)s
+	%(full_base)s
 full_no_cuda = 
-	%(_full_base)s
+	%(full_base)s
 	nabu>=2023.3.1dev, <2024.2
 full = 
-	%(_full_base)s
+	%(full_base)s
 	nabu[full]>=2023.3.1dev
 	pycuda<2024.1.1
 	scikit-cuda
@@ -125,17 +125,17 @@ doc =
 	pydata_sphinx_theme
 	sphinx-design
 	sphinx-autodoc-typehints
-_dev_spec = 
+dev_spec = 
 	black
 	flake8
 	timeout-decorator
 	pyopencl
 dev = 
 	%(full)s
-	%(_dev_spec)s
+	%(dev_spec)s
 dev_no_cuda = 
 	%(full_no_cuda)s
-	%(_dev_spec)s
+	%(dev_spec)s
 test = 
 	pytest-asyncio
 	tomoscan[test]>=2.0.2rc17

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer/core/process/reconstruction/axis/params.py

@@ -62,10 +62,10 @@ _WITH_PAG = "withpag"
 _NO_PAG = "nopag"
 
 
-DEFAULT_CMP_THETA = 10
-DEFAULT_CMP_N_SUBSAMPLING_Y = 10
+DEFAULT_CMP_THETA = 5
+DEFAULT_CMP_N_SUBSAMPLING_Y = 40
 DEFAULT_CMP_NEAR_POS = 0
-DEFAULT_CMP_NEAR_WIDTH = 20
+DEFAULT_CMP_NEAR_WIDTH = 40
 DEFAULT_CMP_OVERSAMPLING = 4
 DEFAULT_CMP_TAKE_LOG = True
 

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer/core/utils/scanutils.py

@@ -40,7 +40,10 @@ from silx.io.utils import h5py_read_dataset
 from tomoscan.esrf.scan.mock import MockEDF as _MockEDF
 from tomoscan.esrf.scan.mock import MockNXtomo as _MockNXtomo
 from tomoscan.io import HDF5File
-from tomoscan.test.utils import MockContext
+try:
+    from tomoscan.test.utils import MockContext
+except ImportError:
+    from tomoscan.tests.utils import MockContext
 
 from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.nxtomoscan import NXtomoScan

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer/gui/cluster/slurm.py

@@ -401,6 +401,7 @@ class SlurmSettingsWidget(qt.QWidget):
         self._queue.currentTextChanged.connect(self._partitionChanged)
         self._nGpu.valueChanged.connect(self._nGpuChanged)
         self._gpuCardCB.currentTextChanged.connect(self._configurationChanged)
+        self._exportValueCM.currentIndexChanged.connect(self._configurationChanged)
 
     def _nGpuChanged(self, *args, **kwargs):
         nGpu = self.getNGPU()

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer/tests/datasets.py

@@ -1,5 +1,8 @@
 import os
-from tomoscan.test.datasets import GitlabProject
+try:
+    from tomoscan.test.datasets import GitlabProject
+except ImportError:
+    from tomoscan.tests.datasets import GitlabProject
 
 TomwerCIDatasets = GitlabProject(
     branch_name="tomwer",

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 3
-MICRO = 21
+MICRO = 23
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.3.21 → tomwer-1.3.23/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.21
+Version: 1.3.23
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -27,7 +27,7 @@ Requires-Dist: psutil
 Requires-Dist: silx[full]>=2.0
 Requires-Dist: tomoscan>=2.0.0a11
 Requires-Dist: nxtomo<1.3,>=1.2.3rc1
-Requires-Dist: nxtomomill>=1.0dev
+Requires-Dist: nxtomomill<1.1,>=1.0dev
 Requires-Dist: processview>=1.3
 Requires-Dist: ewoks>=0.1.1
 Requires-Dist: ewoksorange<0.7,>=0.6

{tomwer-1.3.21 → tomwer-1.3.23}/tomwer.egg-info/requires.txt

@@ -4,7 +4,7 @@ psutil
 silx[full]>=2.0
 tomoscan>=2.0.0a11
 nxtomo<1.3,>=1.2.3rc1
-nxtomomill>=1.0dev
+nxtomomill<1.1,>=1.0dev
 processview>=1.3
 ewoks>=0.1.1
 ewoksorange<0.7,>=0.6
@@ -13,29 +13,6 @@ packaging
 flufl-lock
 pyunitsystem<2.0,>=1.1.0
 
-[_dev_spec]
-black
-flake8
-timeout-decorator
-pyopencl
-
-[_full_base]
-ewoks[orange]>=0.1.1
-rsyncmanager
-graypy
-fabio
-h5py>=3
-lxml
-werkzeug
-json-rpc
-scipy
-Pillow
-glymur
-resource
-tifffile
-hdf5plugin
-pyicat_plus
-
 [dev]
 ewoks[orange]>=0.1.1
 rsyncmanager
@@ -82,6 +59,12 @@ flake8
 timeout-decorator
 pyopencl
 
+[dev_spec]
+black
+flake8
+timeout-decorator
+pyopencl
+
 [doc]
 ewoks[orange]>=0.1.1
 rsyncmanager
@@ -127,6 +110,23 @@ nabu[full]>=2023.3.1dev
 pycuda<2024.1.1
 scikit-cuda
 
+[full_base]
+ewoks[orange]>=0.1.1
+rsyncmanager
+graypy
+fabio
+h5py>=3
+lxml
+werkzeug
+json-rpc
+scipy
+Pillow
+glymur
+resource
+tifffile
+hdf5plugin
+pyicat_plus
+
 [full_no_cuda]
 ewoks[orange]>=0.1.1
 rsyncmanager