Merge branch 'master' into develop

# Conflicts:
#	CHANGELOG.md

Author: PierreRaybaut

CHANGELOG.md

@@ -6,6 +6,28 @@ In this release, test coverage is 79%.
 
 💥 New features / Enhancements:
 
+* Alternative dictionary argument for plot options:
+  * This new feature was introduced in the context of the cyclic import bug fix,
+    to avoid importing the `plotpy.plot` module just to get the `PlotOptions` or
+    `BasePlotOptions` classes
+  * All classes (and a few functions) that used to take an `options` argument as
+    a `BasePlotOptions` or `PlotOptions` instance now also accept a dictionary
+    argument with the same keys as the `BasePlotOptions` or `PlotOptions` class
+    attributes, and the same values as the corresponding attributes
+  * This concerns the following classes and functions:
+    * `plotpy.plot.BasePlot`
+    * `plotpy.plot.PlotWidget`
+    * `plotpy.plot.PlotDialog`
+    * `plotpy.plot.PlotWindow`
+    * `plotpy.plot.SubPlotWidget`
+    * `plotpy.plot.SyncPlotWindow`
+    * `plotpy.tools.RotateCropTool`
+    * `plotpy.widgets.fit.FitDialog`
+    * `plotpy.widgets.fliprotate.FlipRotateDialog`
+    * `plotpy.widgets.rotatecrop.RotateCropDialog`
+    * `plotpy.widgets.selectdialog.SelectDialog`
+    * `plotpy.widgets.selectdialog.select_with_shape_tool`
+
 * Added "Lock LUT range" option for image items:
   * This new option is disabled by default, which matches the previous behavior:
     when updating an image item data, the LUT range is automatically adjusted to
@@ -20,12 +42,16 @@ In this release, test coverage is 79%.
   * See test script `tests.features.test_image_data_update` for an example of usage
     of the new option and tool
 
-## Version 2.4.3 ##
-
-In this release, test coverage is 79%.
+* Added missing `set_style` method to `XRangeSelection` class: this method is used
+  to set the style of the range selection item from configuration options
 
 🛠️ Bug fixes:
 
+* [Issue #19](https://github.com/PlotPyStack/PlotPy/issues/19) - Fix `distutils`
+  deprecation in setup.py: replaced `distutils.core` by `setuptools` in the setup.py
+  script to avoid the deprecation warning when building the package with Python 3.10
+  and 3.11, and to ensure compatibility with earlier Python versions (PlotPy is already
+  compatible with the most recent Python versions: this only concerns the build system)
 * Fix cyclic import in `plotpy.tools` module:
   * Some tools in `plotpy.tools` subpackage were importing the `plotpy.plot` module,
     which was importing the `plotpy.tools` module, causing a cyclic import issue
@@ -46,30 +72,6 @@ In this release, test coverage is 79%.
   * This is now fixed: the `activate` method is called only once when triggering an
     interactive tool
 
-💥 New features / Enhancements:
-
-* Alternative dictionary argument for plot options:
-  * This new feature was introduced in the context of the cyclic import bug fix,
-    to avoid importing the `plotpy.plot` module just to get the `PlotOptions` or
-    `BasePlotOptions` classes
-  * All classes (and a few functions) that used to take an `options` argument as
-    a `BasePlotOptions` or `PlotOptions` instance now also accept a dictionary
-    argument with the same keys as the `BasePlotOptions` or `PlotOptions` class
-    attributes, and the same values as the corresponding attributes
-  * This concerns the following classes and functions:
-    * `plotpy.plot.BasePlot`
-    * `plotpy.plot.PlotWidget`
-    * `plotpy.plot.PlotDialog`
-    * `plotpy.plot.PlotWindow`
-    * `plotpy.plot.SubPlotWidget`
-    * `plotpy.plot.SyncPlotWindow`
-    * `plotpy.tools.RotateCropTool`
-    * `plotpy.widgets.fit.FitDialog`
-    * `plotpy.widgets.fliprotate.FlipRotateDialog`
-    * `plotpy.widgets.rotatecrop.RotateCropDialog`
-    * `plotpy.widgets.selectdialog.SelectDialog`
-    * `plotpy.widgets.selectdialog.select_with_shape_tool`
-
 ## Version 2.4.2 ##
 
 In this release, test coverage is 79%.

MANIFEST.in

@@ -3,6 +3,5 @@ graft qtdesigner
 graft src
 graft colormaps
 include *.desktop
-include conftest.py
 include CHANGELOG.md
 include requirements.txt