Merge pull request #2170 from silx-kit/2024.05

branch for the deployment of pyFAI-2024.05
silx-kit · May 21, 2024 · 0cbd613 · 0cbd613
2 parents 170e807 + ec844b9
commit 0cbd613
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 40 deletions.
diff --git a/doc/source/coverage.rst b/doc/source/coverage.rst
@@ -1,38 +1,39 @@
 Test coverage report for pyFAI
 ==============================
 
-Measured on *pyFAI* version 2024.2.0, 01/02/2024
+Measured on *pyFAI* version 2024.5.0-dev0, 21/05/2024
 
 .. csv-table:: Test suite coverage
    :header: "Name", "Stmts", "Exec", "Cover"
    :widths: 35, 8, 8, 8
 
    "__init__.py", "39", "25", "64.1 %"
    "average.py", "495", "356", "71.9 %"
-   "azimuthalIntegrator.py", "1751", "1168", "66.7 %"
+   "azimuthalIntegrator.py", "1850", "1164", "62.9 %"
    "blob_detection.py", "502", "191", "38.0 %"
    "calibrant.py", "462", "369", "79.9 %"
-   "containers.py", "467", "420", "89.9 %"
+   "containers.py", "473", "426", "90.1 %"
    "control_points.py", "360", "136", "37.8 %"
-   "diffmap.py", "420", "57", "13.6 %"
+   "diffmap.py", "476", "201", "42.2 %"
    "directories.py", "21", "16", "76.2 %"
    "distortion.py", "605", "386", "63.8 %"
    "geometryRefinement.py", "572", "291", "50.9 %"
    "goniometer.py", "566", "340", "60.1 %"
    "grid.py", "36", "15", "41.7 %"
-   "load_integrators.py", "164", "119", "72.6 %"
+   "load_integrators.py", "166", "121", "72.9 %"
    "massif.py", "239", "196", "82.0 %"
-   "method_registry.py", "259", "221", "85.3 %"
+   "method_registry.py", "350", "281", "80.3 %"
    "multi_geometry.py", "177", "136", "76.8 %"
    "parallax.py", "249", "211", "84.7 %"
+   "ring_extraction.py", "119", "111", "93.3 %"
    "spline.py", "427", "252", "59.0 %"
-   "units.py", "205", "201", "98.0 %"
-   "version.py", "63", "46", "73.0 %"
-   "worker.py", "477", "311", "65.2 %"
+   "units.py", "241", "210", "87.1 %"
+   "version.py", "63", "51", "81.0 %"
+   "worker.py", "490", "323", "65.9 %"
    "app/__init__.py", "7", "7", "100.0 %"
    "app/average.py", "176", "35", "19.9 %"
    "app/benchmark.py", "64", "21", "32.8 %"
-   "app/calib2.py", "366", "37", "10.1 %"
+   "app/calib2.py", "380", "37", "9.7 %"
    "app/calib.py", "31", "21", "67.7 %"
    "app/check_calib.py", "32", "21", "65.6 %"
    "app/detector2nexus.py", "87", "20", "23.0 %"
@@ -43,41 +44,43 @@ Measured on *pyFAI* version 2024.2.0, 01/02/2024
    "app/integrate.py", "517", "385", "74.5 %"
    "app/mx_calibrate.py", "31", "20", "64.5 %"
    "app/peakfinder.py", "289", "55", "19.0 %"
+   "app/pilx.py", "22", "13", "59.1 %"
    "app/recalib.py", "32", "20", "62.5 %"
    "app/saxs.py", "87", "26", "29.9 %"
    "app/sparsify.py", "284", "56", "19.7 %"
    "app/waxs.py", "99", "27", "27.3 %"
-   "benchmark/__init__.py", "622", "85", "13.7 %"
+   "benchmark/__init__.py", "622", "86", "13.8 %"
    "detectors/__init__.py", "24", "24", "100.0 %"
    "detectors/_adsc.py", "76", "76", "100.0 %"
-   "detectors/_common.py", "854", "623", "73.0 %"
+   "detectors/_common.py", "856", "625", "73.0 %"
    "detectors/_dectris.py", "416", "298", "71.6 %"
    "detectors/_esrf.py", "97", "81", "83.5 %"
    "detectors/_hexagonal.py", "73", "70", "95.9 %"
-   "detectors/_imxpad.py", "401", "257", "64.1 %"
+   "detectors/_imxpad.py", "401", "259", "64.6 %"
    "detectors/_non_flat.py", "158", "131", "82.9 %"
    "detectors/_others.py", "133", "120", "90.2 %"
    "detectors/_psi.py", "188", "111", "59.0 %"
    "detectors/_rayonix.py", "264", "226", "85.6 %"
    "detectors/_xspectrum.py", "51", "48", "94.1 %"
    "detectors/orientation.py", "36", "36", "100.0 %"
-   "engines/CSC_engine.py", "207", "139", "67.1 %"
+   "engines/CSC_engine.py", "207", "136", "65.7 %"
    "engines/CSR_engine.py", "200", "194", "97.0 %"
    "engines/__init__.py", "19", "19", "100.0 %"
    "engines/histogram_engine.py", "94", "87", "92.6 %"
-   "engines/preproc.py", "109", "92", "84.4 %"
+   "engines/preproc.py", "114", "93", "81.6 %"
    "ext/__init__.py", "3", "3", "100.0 %"
    "geometry/__init__.py", "9", "9", "100.0 %"
-   "geometry/core.py", "1245", "1032", "82.9 %"
+   "geometry/core.py", "1219", "1005", "82.4 %"
    "geometry/cxi.py", "1", "1", "100.0 %"
    "geometry/fit2d.py", "114", "103", "90.4 %"
+   "geometry/imaged11.py", "116", "101", "87.1 %"
    "gui/ApplicationContext.py", "107", "52", "48.6 %"
    "gui/CalibrationContext.py", "224", "130", "58.0 %"
    "gui/CalibrationWindow.py", "192", "169", "88.0 %"
    "gui/IntegrationDialog.py", "205", "54", "26.3 %"
    "gui/__init__.py", "4", "4", "100.0 %"
    "gui/cli_calibration.py", "1589", "104", "6.5 %"
-   "gui/diffmap_widget.py", "371", "63", "17.0 %"
+   "gui/diffmap_widget.py", "411", "70", "17.0 %"
    "gui/matplotlib.py", "33", "26", "78.8 %"
    "gui/mpl_calib.py", "241", "40", "16.6 %"
    "gui/mpl_calib_qt.py", "49", "21", "42.9 %"
@@ -91,24 +94,24 @@ Measured on *pyFAI* version 2024.2.0, 01/02/2024
    "gui/dialog/__init__.py", "4", "4", "100.0 %"
    "gui/helper/MarkerManager.py", "209", "65", "31.1 %"
    "gui/helper/ProcessingWidget.py", "19", "6", "31.6 %"
-   "gui/helper/RingCalibration.py", "306", "47", "15.4 %"
+   "gui/helper/RingCalibration.py", "307", "47", "15.3 %"
    "gui/helper/RingExtractor.py", "238", "35", "14.7 %"
    "gui/helper/SynchronizeMaskToolColor.py", "27", "27", "100.0 %"
    "gui/helper/SynchronizePlotBackground.py", "27", "26", "96.3 %"
    "gui/helper/SynchronizeRawView.py", "56", "46", "82.1 %"
    "gui/helper/__init__.py", "4", "4", "100.0 %"
    "gui/helper/model_transform.py", "113", "16", "14.2 %"
    "gui/jupyter/__init__.py", "1", "1", "100.0 %"
-   "gui/jupyter/_plot.py", "94", "15", "16.0 %"
-   "gui/jupyter/calib.py", "92", "26", "28.3 %"
+   "gui/jupyter/_plot.py", "98", "15", "15.3 %"
+   "gui/jupyter/calib.py", "92", "24", "26.1 %"
    "gui/model/AbstractModel.py", "35", "30", "85.7 %"
    "gui/model/CalibrantModel.py", "19", "17", "89.5 %"
    "gui/model/CalibrationModel.py", "44", "42", "95.5 %"
    "gui/model/ConstraintModel.py", "60", "21", "35.0 %"
    "gui/model/DataModel.py", "15", "14", "93.3 %"
    "gui/model/DataModelAdaptor.py", "27", "12", "44.4 %"
    "gui/model/DetectorModel.py", "16", "15", "93.8 %"
-   "gui/model/ExperimentSettingsModel.py", "87", "78", "89.7 %"
+   "gui/model/ExperimentSettingsModel.py", "101", "92", "91.1 %"
    "gui/model/FilenameModel.py", "21", "14", "66.7 %"
    "gui/model/Fit2dGeometryModel.py", "64", "32", "50.0 %"
    "gui/model/GeometryConstraintsModel.py", "86", "41", "47.7 %"
@@ -118,17 +121,33 @@ Measured on *pyFAI* version 2024.2.0, 01/02/2024
    "gui/model/IntegrationSettingsModel.py", "26", "23", "88.5 %"
    "gui/model/ListModel.py", "127", "92", "72.4 %"
    "gui/model/MarkerModel.py", "42", "33", "78.6 %"
-   "gui/model/MaskedImageModel.py", "31", "30", "96.8 %"
+   "gui/model/MaskedImageModel.py", "31", "17", "54.8 %"
    "gui/model/PeakModel.py", "88", "58", "65.9 %"
    "gui/model/PeakSelectionModel.py", "85", "34", "40.0 %"
    "gui/model/PlotViewModel.py", "64", "62", "96.9 %"
+   "gui/model/PreProcessedImageModel.py", "55", "46", "83.6 %"
    "gui/model/__init__.py", "4", "4", "100.0 %"
+   "gui/pilx/HorizontalRangeROI.py", "17", "13", "76.5 %"
+   "gui/pilx/MainWindow.py", "191", "38", "19.9 %"
+   "gui/pilx/__init__.py", "0", "0", "0.0 %"
+   "gui/pilx/models.py", "10", "10", "100.0 %"
+   "gui/pilx/utils.py", "48", "21", "43.8 %"
+   "gui/pilx/widgets/DiffractionImagePlotWidget.py", "43", "19", "44.2 %"
+   "gui/pilx/widgets/ImagePlotWidget.py", "69", "29", "42.0 %"
+   "gui/pilx/widgets/IntegratedPatternPlotWidget.py", "94", "29", "30.9 %"
+   "gui/pilx/widgets/MapPlotContextMenu.py", "50", "22", "44.0 %"
+   "gui/pilx/widgets/MapPlotWidget.py", "108", "33", "30.6 %"
+   "gui/pilx/widgets/OpenAxisDatasetAction.py", "30", "16", "53.3 %"
+   "gui/pilx/widgets/RoiModeAction.py", "25", "15", "60.0 %"
+   "gui/pilx/widgets/RoiRangeWidget.py", "51", "19", "37.3 %"
+   "gui/pilx/widgets/TitleWidget.py", "13", "10", "76.9 %"
+   "gui/pilx/widgets/__init__.py", "0", "0", "0.0 %"
    "gui/tasks/AbstractCalibrationTask.py", "79", "72", "91.1 %"
-   "gui/tasks/ExperimentTask.py", "326", "242", "74.2 %"
-   "gui/tasks/GeometryTask.py", "809", "374", "46.2 %"
-   "gui/tasks/IntegrationTask.py", "776", "300", "38.7 %"
+   "gui/tasks/ExperimentTask.py", "334", "250", "74.9 %"
+   "gui/tasks/GeometryTask.py", "814", "376", "46.2 %"
+   "gui/tasks/IntegrationTask.py", "784", "300", "38.3 %"
    "gui/tasks/MaskTask.py", "221", "148", "67.0 %"
-   "gui/tasks/PeakPickingTask.py", "1356", "586", "43.2 %"
+   "gui/tasks/PeakPickingTask.py", "1361", "588", "43.2 %"
    "gui/tasks/__init__.py", "4", "4", "100.0 %"
    "gui/test/__init__.py", "53", "36", "67.9 %"
    "gui/utils/FilterBuilder.py", "44", "14", "31.8 %"
@@ -179,24 +198,24 @@ Measured on *pyFAI* version 2024.2.0, 01/02/2024
    "io/__init__.py", "568", "371", "65.3 %"
    "io/_json.py", "15", "12", "80.0 %"
    "io/image.py", "24", "20", "83.3 %"
-   "io/integration_config.py", "153", "139", "90.8 %"
-   "io/nexus.py", "435", "371", "85.3 %"
+   "io/integration_config.py", "161", "140", "87.0 %"
+   "io/nexus.py", "437", "373", "85.4 %"
    "io/ponifile.py", "193", "167", "86.5 %"
    "io/sparse_frame.py", "153", "24", "15.7 %"
    "io/spots.py", "210", "139", "66.2 %"
    "io/xrdml.py", "77", "76", "98.7 %"
    "opencl/OCLFullSplit.py", "199", "24", "12.1 %"
-   "opencl/__init__.py", "40", "33", "82.5 %"
-   "opencl/azim_csr.py", "564", "405", "71.8 %"
-   "opencl/azim_hist.py", "472", "332", "70.3 %"
-   "opencl/azim_lut.py", "329", "246", "74.8 %"
+   "opencl/__init__.py", "42", "35", "83.3 %"
+   "opencl/azim_csr.py", "565", "407", "72.0 %"
+   "opencl/azim_hist.py", "474", "340", "71.7 %"
+   "opencl/azim_lut.py", "330", "247", "74.8 %"
    "opencl/ocl_hist_pixelsplit.py", "223", "27", "12.1 %"
    "opencl/peak_finder.py", "474", "368", "77.6 %"
-   "opencl/preproc.py", "224", "172", "76.8 %"
+   "opencl/preproc.py", "225", "173", "76.9 %"
    "opencl/sort.py", "282", "223", "79.1 %"
    "opencl/test/__init__.py", "25", "25", "100.0 %"
-   "resources/__init__.py", "31", "20", "64.5 %"
-   "test/__init__.py", "33", "4", "12.1 %"
+   "resources/__init__.py", "41", "25", "61.0 %"
+   "test/__init__.py", "35", "4", "11.4 %"
    "third_party/__init__.py", "1", "1", "100.0 %"
    "third_party/transformations.py", "7", "7", "100.0 %"
    "third_party/_local/__init__.py", "4", "4", "100.0 %"
@@ -210,10 +229,10 @@ Measured on *pyFAI* version 2024.2.0, 01/02/2024
    "utils/header_utils.py", "74", "59", "79.7 %"
    "utils/logging_utils.py", "43", "41", "95.3 %"
    "utils/mask_utils.py", "73", "41", "56.2 %"
-   "utils/mathutil.py", "452", "314", "69.5 %"
+   "utils/mathutil.py", "460", "319", "69.3 %"
    "utils/multiprocessing.py", "18", "13", "72.2 %"
    "utils/orderedset.py", "54", "13", "24.1 %"
    "utils/shell.py", "55", "46", "83.6 %"
    "utils/stringutil.py", "74", "67", "90.5 %"
 
-   "pyFAI total", "37183", "20688", "55.6 %"
+   "pyFAI total", "38664", "21488", "55.6 %"
diff --git a/meson.build b/meson.build
@@ -21,7 +21,8 @@ endif
 if os.is_file('PYFAI_WITH_OPENMP')
   openmp_var = os.read('PYFAI_WITH_OPENMP').strip()
 else
-  res = run_command(py, '-c', 'import os; print(os.environ["PYFAI_WITH_OPENMP"])')
+  res = run_command(py, '-c', 'import os; print(os.environ["PYFAI_WITH_OPENMP"])',
+                    check:false)
   if res.returncode() == 0
     openmp_var = res.stdout().strip()
   else

diff --git a/version.py b/version.py
@@ -47,7 +47,7 @@
 __authors__ = ["Jérôme Kieffer", "V. Valls"]
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__date__ = "15/04/2024"
+__date__ = "21/05/2024"
 __status__ = "production"
 __docformat__ = 'restructuredtext'
 __all__ = ["date", "version_info", "strictversion", "hexversion", "debianversion",
@@ -63,7 +63,7 @@
 MAJOR = 2024
 MINOR = 5
 MICRO = 0
-RELEV = "dev"  # <16
+RELEV = "final"  # <16
 SERIAL = 0  # <16
 
 date = __date__