fixes CSV ranking report on macOS

Author: MAKOMO

README.md

@@ -62,6 +62,7 @@ Version History
 
 | Version | Date  | Comment |
 |---------|------:|---------|
+| [v3.1.2](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.1.2) | Apr XX, 2025 | Adds event replay ramping, event dragging, [IMF machine control](https://artisan-scope.org/machines/imf/) setups, extended support for [Giesen machines](https://artisan-scope.org/machines/giesen/), fixes [Loring autoCHARGE/DROP](https://artisan-scope.org/machines/loring/), support for [Carmomaq's Stratto Lab sample roaster](https://artisan-scope.org/machines/carmomaq/), support for [Phidget motor controllers](https://artisan-scope.org/devices/phidgets/#45-dc-motor-control), support for energy meters, [ROEST CSV import](https://artisan-scope.org/machines/roest/), improved Cropster import, many small fixes and UI improvements |
 | [v3.1.0](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.1.0) | Nov&nbsp;22,&nbsp;2024 | Adds support for induction heated [Gemma machines by Sweet Coffee Italia](https://artisan-scope.org/machines/sci/), the latest [Santoker machines](https://artisan-scope.org/machines/santoker/) connecting via Bluetooth, [Primo roasting machines](https://artisan-scope.org/machines/primo/), [ColorTrack](https://artisan-scope.org/devices/colortrack/) sensors, [Stronghold](https://stronghold.coffee/) profile import, and [Phidget stepper controllers](https://artisan-scope.org/devices/phidgets/) and more.<br><b>Release Sponsor: [Algrano](https://algrano.com/artisan?utm_source=artisan_blog&utm_medium=referral&utm_campaign=algrano_x_artisan&utm_content=blog)</b><br/> |
 | [v3.0.2](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.0.2) | Aug&nbsp;20,&nbsp;2024 | Bug fixes |
 | [v3.0.0](https://github.com/artisan-roaster-scope/artisan/releases/tag/v3.0.0) | Aug&nbsp;1,&nbsp;2024 | Adds [roast scheduling](https://doc.artisan.plus/docs/schedule/) support<br><b>Release Sponsor: [artisan.plus](https://artisan.plus/)</b><br/> |

src/artisan.py

@@ -14,6 +14,9 @@
 # which should not be significant
 os.environ['OMP_NUM_THREADS'] = '1'
 
+# deactivate defusedexml in OPENPYXL as it might not be installed or bundled
+os.environ['OPENPYXL_DEFUSEDXML'] = 'False'
+
 # highDPI support must be set before creating the Application instance
 try:
 # the following two lines seem not to be needed any longer with Qt6.1

src/artisanlib/main.py

@@ -22095,6 +22095,7 @@ def rankingReport(self, pdf:bool = False) -> None:
                             _, _, exc_tb = sys.exc_info()
                             self.qmc.adderror((QApplication.translate('Error Message','Exception:') + ' rankingReport() {0}').format(str(e)),getattr(exc_tb, 'tb_lineno', '?'))
 
+
                     try:
                         # Create a roast phase visualization graph
 
@@ -22249,7 +22250,10 @@ def rankingReport(self, pdf:bool = False) -> None:
                         if prev_backgroundpath:
                             self.loadbackground(prev_backgroundpath)
                             self.qmc.background = prev_background
-                        self.qmc.timealign()
+                        if prev_foreground_profile_path or prev_backgroundpath:
+                            self.qmc.timealign()
+                        else:
+                            self.qmc.reset()
                     except Exception as e: # pylint: disable=broad-except
                         _log.exception(e)
 

src/requirements-dev.txt

@@ -1,7 +1,7 @@
 types-openpyxl>=3.1.5.20250306
 types-Pillow>=10.2.0.20240822
 types-protobuf>=5.29.1.20250315
-types-psutil>=7.0.0.20250218
+types-psutil>=7.0.0.20250401
 types-pyserial>=3.5.0.20250326
 types-python-dateutil==2.9.0.20241206
 types-pytz>=2025.2.0.20250326
@@ -25,8 +25,8 @@ pytest-cov==6.0.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.130.5
-coverage>=7.7.1
+hypothesis>=6.130.6
+coverage>=7.8.0
 coverage-badge==1.1.2
 codespell==2.4.1
 # the following 2 packages are not installed along aiohttp on Python3.12 and make mypy complain

src/requirements.txt

@@ -67,13 +67,13 @@ matplotlib==3.7.3; python_version < '3.9' # last Python 3.8 release
 matplotlib==3.10.0; python_version >= '3.9'
 jinja2==3.1.5
 aiohttp==3.10.11; python_version < '3.9' # last Python 3.8 release
-aiohttp==3.11.14; python_version >= '3.9'
+aiohttp==3.11.15; python_version >= '3.9'
 aiohttp_jinja2==1.6
 python-bidi==0.4.2; python_version < '3.9' # last Python 3.8 release
 python-bidi==0.6.6; python_version >= '3.9'
 arabic-reshaper==3.0.0
 pillow==10.4.0; python_version < '3.9' # last Python 3.8 release
-pillow>=11.1.0; python_version >= '3.9'
+pillow>=11.2.0; python_version >= '3.9'
 pydantic==2.11.1; (platform_system=='Windows' and python_version>'3.10') or sys_platform=='darwin' or platform_system=='Linux'
 pydantic==2.7.1; (platform_system=='Windows' and python_version<'3.9')  # last version working with Windows 7/8 pending resolution of pydantic Issue #9920
 babel==2.17.0

wiki/ReleaseHistory.md

@@ -2,18 +2,20 @@ Detailed Release History
 ========================
 
 ----
-v3.1.1
+v3.1.2 (April XX, 2025)
 ------------------
 
 
 * ADDITIONS
+  - adds event replay ramping by time and temperature
+  - events displayed in step and combo mode can be updated by moving them to a new position. Pressing SHIFT restricts the movement in either the x or the y direction.
+  - a picked custom event can be removed using the backspace key
   - adds drag-and-drop to Stats Summary table configuration
   - adds hiding of scheduled items via a right-click or drag-out
   - adds support for feeding data from energy meters into Artisans roast energy calculator
   - adds new flag "Set batch size" to background dialog. If ticked the batch size is taken from the background profile on load while scheduler is off
   - adds sorting to the background events table
   - adds configuration to allow to send MODBUS PID SV as 32bit float
-  - adds event replay ramping by time and temperature
   - adds new Artisan Commands (with `n` from `{1,2,3,4}`)
       - `quantifier(n,<bool>)` to toggle quantification per event type
       - `playback(n,<bool>)` to toggle event playback per event type
@@ -23,16 +25,14 @@ v3.1.1
   - adds event slider input dialog via a double-click on a sliders LCD
   - adds slider focus on slider LCD click
   - adds quick keyboard focused event slider input using numeric keys followed by the ENTER/RETURN key. The last digit can be removed by using the backspace key. ESC cancels the action.
-  - events displayed in step and combo mode can be updated by moving them to a new position. Pressing SHIFT restricts the movement in either the x or the y direction.
-  - a picked custom event can be removed using the backspace key
   - a double click on the graph canvas temporarily scales the y-axis to cover all artists
   - adds search to help pages
 
 
 * NEW HARDWARE SUPPORT
-  - adds support for [Carmomaq's Stratto Lab sample roaster](https://carmomaq.com.br/en/produtos/stratto-roaster-lab/)
   - adds a new [IMF](https://artisan-scope.org/machines/imf/) machine setup that supports machine control enabling IT/BT and IT/Power profiling
   - updated [Giesen](https://artisan-scope.org/machines/giesen/) machine support (now incl. sample roasters and PRO machines) supporting the control of additional actors
+  - adds support for [Carmomaq's Stratto Lab sample roaster](https://artisan-scope.org/machines/carmomaq/)
   - adds support for the [DCC1100 and DCC1120 Brushless DC Motor controllers and the DCC1020 DC Motor controller](https://artisan-scope.org/devices/phidgets/#45-dc-motor-control) ([Discussion #1750](../../../discussions/1750))
   - adds [ROEST](https://artisan-scope.org/machines/roest/) CSV import
   - adds [Thermoworks BlueDOT](https://www.thermoworks.com/bluedot) support
@@ -50,17 +50,17 @@ v3.1.1
   - the parameters "max. number of custom buttons per row", "button size", "alternative slider layout", "mark last pressed" and "show tooltips" are now persisted per palette
   - a click in a sliders pane no longer moves the slider, but just gives that slider the input focus (a click in a slider's bar still moves the slider to this position)
   - the quick custom event entry using the q, w, e and e key followed by number keys now requires the ENTER/RETURN key to establish the new value.  The last entered digit can be removed by using the backspace key. ESC cancels the action.
-  - improved accuracy on rendering [artisan.plus](https://artisan.plus) blend component weights
-  - improved Cropster importer
   - event replay at any time ensures that only future events are replayed. As the set of future events may change on moving the background profile, an event can still be replayed again. In previous Artisan versions, events did replay only once per roast.
   - persist Energy Tab summary choice
   - suppresses pick year from [artisan.plus](https://artisan.plus) beans pop up and roast name suggestion if origin/name combination is unique
+  - improved accuracy on rendering [artisan.plus](https://artisan.plus) blend component weights
+  - improved Cropster importer
 
 * FIXES
+  - fixes processing of MODBUS function 2 request which broke the just introduced autoCHARGE/autoDROP triggered by [Loring machines](https://artisan-scope.org/machines/loring/)
   - ensure complete reset to defaults in energy tab loads tab
   - makes loading of (broken) profiles with inconsistent data length more robust
   - prevents exceptions caused by empty event type names ([Discussion #1745](../../../discussions/1745))
-  - fixes processing of MODBUS function 2 request which broke the just introduced autoCHARGE/autoDROP triggered by Loring machines
   - fixes a typo which allowed to open multiple Roast Properties dialogs ([Issue #1781](../../../issues/1781))
   - fixes regression introduced in v3.0 which prevented the replay of events before CHARGE
   - fixes an issue in event replay where certain events failed to be replayed by temperature