- keep root.dat also on Linux

- lib updates

Author: MAKOMO

src/artisanlib/acaia.py

@@ -92,29 +92,30 @@ class ACAIA_TIMER(IntEnum):
     TIMER_STATE_STARTED = 1
     TIMER_STATE_PAUSED = 2
 
+# Acaia legacy service and characteristics UUIDs
+ACAIA_LEGACY_SERVICE_UUID:Final[str] = '00001820-0000-1000-8000-00805f9b34fb' # Internet Protocol Support Service # adverstised service UUID
+ACAIA_LEGACY_NOTIFY_UUID:Final[str] = '00002a80-0000-1000-8000-00805f9b34fb'
+ACAIA_LEGACY_WRITE_UUID:Final[str] = '00002a80-0000-1000-8000-00805f9b34fb' # same as notify!
+
+# Acaia legacy name prefixes
+ACAIA_LEGACY_PEARL_NAME:Final[str] = 'PROCHBT' # Acaia Pearl
+ACAIA_LEGACY_LUNAR_NAME:Final[str] = 'ACAIA'   # Acaia Lunar Legacy
+
+# Acaia service and characteristics UUIDs
+ACAIA_SERVICE_UUID:Final[str] = '49535343-FE7D-4AE5-8FA9-9FAFD205E455'
+ACAIA_NOTIFY_UUID:Final[str] = '49535343-1E4D-4BD9-BA61-23C647249616'
+ACAIA_WRITE_UUID:Final[str] = '49535343-8841-43F4-A8D4-ECBE34729BB3'
+
+# Acaia name prefixes
+ACAIA_PEARL_NAME:Final[str] = 'PEARL-'   # Acaia Pearl (2021)
+ACAIA_PEARLS_NAME:Final[str] = 'PEARLS'  # Acaia Pearl S
+ACAIA_LUNAR_NAME:Final[str] = 'LUNAR-'   # Acaia Lunar (2021)
+ACAIA_CINCO_NAME:Final[str] = 'CINCO'    # Acaia Cinco
+ACAIA_PYXIS_NAME:Final[str] = 'PYXIS'    # Acaia Pyxis
 
 class AcaiaBLE(ClientBLE):
 
-    # Acaia legacy service and characteristics UUIDs
-    ACAIA_LEGACY_SERVICE_UUID:Final[str] = '00001820-0000-1000-8000-00805f9b34fb' # Internet Protocol Support Service # adverstised service UUID
-    ACAIA_LEGACY_NOTIFY_UUID:Final[str] = '00002a80-0000-1000-8000-00805f9b34fb'
-    ACAIA_LEGACY_WRITE_UUID:Final[str] = '00002a80-0000-1000-8000-00805f9b34fb' # same as notify!
 
-    # Acaia legacy name prefixes
-    ACAIA_LEGACY_PEARL_NAME:Final[str] = 'PROCHBT' # Acaia Pearl
-    ACAIA_LEGACY_LUNAR_NAME:Final[str] = 'ACAIA'   # Acaia Lunar Legacy
-
-    # Acaia service and characteristics UUIDs
-    ACAIA_SERVICE_UUID:Final[str] = '49535343-FE7D-4AE5-8FA9-9FAFD205E455'
-    ACAIA_NOTIFY_UUID:Final[str] = '49535343-1E4D-4BD9-BA61-23C647249616'
-    ACAIA_WRITE_UUID:Final[str] = '49535343-8841-43F4-A8D4-ECBE34729BB3'
-
-    # Acaia name prefixes
-    ACAIA_PEARL_NAME:Final[str] = 'PEARL-'   # Acaia Pearl (2021)
-    ACAIA_PEARLS_NAME:Final[str] = 'PEARLS'  # Acaia Pearl S
-    ACAIA_LUNAR_NAME:Final[str] = 'LUNAR-'   # Acaia Lunar (2021)
-    ACAIA_CINCO_NAME:Final[str] = 'CINCO'    # Acaia Cinco
-    ACAIA_PYXIS_NAME:Final[str] = 'PYXIS'    # Acaia Pyxis
 
     # Acaia message constants
     HEADER1:Final[bytes]      = b'\xef'
@@ -157,16 +158,16 @@ def __init__(self, connected_handler:Optional[Callable[[], None]] = None,
         self.set_heartbeat(self.HEARTBEAT_FREQUENCY) # send keep-alive heartbeat all 3-5sec; seems not to be needed any longer after sending ID on newer firmware versions!?
 
         # register Acaia Legacy UUIDs
-        for legacy_name in (self.ACAIA_LEGACY_LUNAR_NAME, self.ACAIA_LEGACY_PEARL_NAME):
-            self.add_device_description(self.ACAIA_LEGACY_SERVICE_UUID, legacy_name)
-        self.add_notify(self.ACAIA_LEGACY_NOTIFY_UUID, self.notify_callback)
-        self.add_write(self.ACAIA_LEGACY_SERVICE_UUID, self.ACAIA_LEGACY_WRITE_UUID)
+        for legacy_name in (ACAIA_LEGACY_LUNAR_NAME, ACAIA_LEGACY_PEARL_NAME):
+            self.add_device_description(ACAIA_LEGACY_SERVICE_UUID, legacy_name)
+        self.add_notify(ACAIA_LEGACY_NOTIFY_UUID, self.notify_callback)
+        self.add_write(ACAIA_LEGACY_SERVICE_UUID, ACAIA_LEGACY_WRITE_UUID)
 
         # register Acaia Current UUIDs
-        for acaia_name in (self.ACAIA_PEARL_NAME, self.ACAIA_PEARLS_NAME, self.ACAIA_LUNAR_NAME, self.ACAIA_PYXIS_NAME, self.ACAIA_CINCO_NAME):
-            self.add_device_description(self.ACAIA_SERVICE_UUID, acaia_name)
-        self.add_notify(self.ACAIA_NOTIFY_UUID, self.notify_callback)
-        self.add_write(self.ACAIA_SERVICE_UUID, self.ACAIA_WRITE_UUID)
+        for acaia_name in (ACAIA_PEARL_NAME, ACAIA_PEARLS_NAME, ACAIA_LUNAR_NAME, ACAIA_PYXIS_NAME, ACAIA_CINCO_NAME):
+            self.add_device_description(ACAIA_SERVICE_UUID, acaia_name)
+        self.add_notify(ACAIA_NOTIFY_UUID, self.notify_callback)
+        self.add_write(ACAIA_SERVICE_UUID, ACAIA_WRITE_UUID)
 
 
     # protocol parser
@@ -186,9 +187,9 @@ def on_connect(self) -> None:
         self.fast_notifications_sent = False
         self.slow_notifications_sent = False
         connected_service_UUID = self.connected()
-        if connected_service_UUID == self.ACAIA_LEGACY_SERVICE_UUID:
+        if connected_service_UUID == ACAIA_LEGACY_SERVICE_UUID:
             _log.debug('connected to Acaia Legacy Scale')
-        elif connected_service_UUID == self.ACAIA_SERVICE_UUID:
+        elif connected_service_UUID == ACAIA_SERVICE_UUID:
             _log.debug('connected to Acaia Scale')
         if self._connected_handler is not None:
             self._connected_handler()

src/artisanlib/roast_properties.py

@@ -2567,6 +2567,7 @@ def closeEvent(self, _:Optional['QCloseEvent'] = None) -> None:
         self.aw.qmc.roastpropertiesAutoOpenDropFlag = self.org_roastpropertiesAutoOpenDropFlag
 
         self.aw.qmc.clear_last_picked_event_selection()
+        self.aw.eNumberSpinBox.setValue(0)
 
         self.aw.qmc.redraw(recomputeAllDeltas=False)
 
@@ -5273,6 +5274,9 @@ def accept(self) -> None:
             # save column widths
             self.aw.qmc.energytablecolumnwidths = [self.energy_ui.datatable.columnWidth(c) for c in range(self.energy_ui.datatable.columnCount())]
 
+        self.aw.qmc.clear_last_picked_event_selection()
+        self.aw.eNumberSpinBox.setValue(0)
+
         # load selected recent roast template in the background
         if self.aw.loadbackgroundUUID(self.template_file,self.template_uuid):
             try:

src/build-linux.sh

@@ -195,7 +195,7 @@ for babeltrans in $(find dist/_internal/babel/locale-data -type f -name "*.dat")
     babeltrans_filename="${babeltrans##*/}"
     match=0
     for lang in ${SUPPORTED_LANGUAGES}; do
-        if [ ${babeltrans_filename} = "${lang}.dat" ] ; then
+        if [ ${babeltrans_filename} = "${lang}.dat" ] && [ ${babeltrans_filename} != "root.dat" ] ; then
             match=1
             break
         fi

src/plus/schedule.py

@@ -1088,10 +1088,7 @@ def getRight(self) -> str:
             return f'{weight}{task_date_str}'
         except Exception as e: # pylint: disable=broad-except
             # if anything goes wrong here we log an exception and return the empty string
-            try: # catch exception on logging exception!
-                _log.error(e)
-            except Exception as e: # pylint: disable=broad-except
-                pass
+            _log.exception(e)
             return ''
 
     def select(self) -> None:

src/requirements-dev.txt

@@ -1,20 +1,20 @@
-types-openpyxl>=3.1.5.20241225
+types-openpyxl>=3.1.5.20250306
 types-Pillow>=10.2.0.20240822
 types-protobuf>=5.29.1.20250208
 types-psutil>=7.0.0.20250218
 types-pyserial>=3.5.0.20250304
 types-python-dateutil==2.9.0.20241206
 types-pytz>=2025.1.0.20250204
 types-pyyaml>=6.0.12.20241230
-types-requests>=2.32.0.20241016
+types-requests>=2.32.0.20250306
 types-setuptools>=75.8.2.20250305
 types-urllib3>=1.26.25.14
 types-docutils>=0.21.0.20241128
 lxml-stubs>=0.5.1
 mypy==1.15.0
 pyright==1.1.396
-ruff>=0.9.9
-pylint==3.3.4
+ruff>=0.9.10
+pylint==3.3.5
 pre-commit>=4.1.0
 pytest>=8.3.5
 pytest-cov==6.0.0
@@ -25,7 +25,7 @@ pytest-cov==6.0.0
 #pytest-bdd==6.1.1
 #pytest-benchmark==4.0.0
 #pytest-mock==3.11.1
-hypothesis>=6.127.6
+hypothesis>=6.128.2
 coverage>=7.6.12
 coverage-badge==1.1.2
 codespell==2.4.1

src/requirements.txt

@@ -19,7 +19,7 @@
 ######
 # the following commented package versions are read by appveyor.yml and downloaded outside of pip.
 #
-# pyinstaller==6.11.1; platform_system='Windows'
+# pyinstaller==6.12.0; platform_system='Windows'
 # libusb==1.0.26;  platform_system='Linux'
 # dotenv==2.8.1;   platform_system='Linux'  # v3.0.0 not compatible with fpm  # gem installed, not pip
 #
@@ -46,7 +46,7 @@ portalocker==2.10.1;  python_version < '3.9' # last Python 3.8 release
 portalocker==3.1.1; python_version >= '3.9'
 xlrd==2.0.1
 websockets==13.1;  python_version < '3.9' # last Python 3.8 release
-websockets==15.0; python_version >= '3.9'
+websockets==15.0.1; python_version >= '3.9'
 PyYAML==6.0.2
 psutil==7.0.0
 typing-extensions==4.10.0; python_version < '3.8' # required for supporting Final and TypeDict on Python <3.8
@@ -101,7 +101,7 @@ PyQtWebEngine==5.15.6; (sys_platform=='darwin' and platform_release<'20.0') or (
 PyQt6==6.8.1; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
 PyQt6-WebEngine==6.8.0; (sys_platform=='darwin' and platform_release>='20.0') or (platform_system=='Windows' and python_version>'3.10') or (platform_system=='Linux' and platform_machine!='aarch64')
 ###
-pyinstaller==6.11.1; platform_system=='Linux' # on Windows pyinstaller is separately installed (see above)
+pyinstaller==6.12.0; platform_system=='Linux' # on Windows pyinstaller is separately installed (see above)
 ###
 ### Qt build tools not part of PyQt but required by build-derived
 qt5-tools==5.15.2.1.3; (platform_system=='Windows' and python_version<'3.9')
@@ -133,8 +133,8 @@ SecretStorage==3.3.3; platform_system=='Linux'
 ### Windows specific packages
 ###
 build==1.2.2.post1; platform_system=='Windows'  # required to build pyinstaller bootloader
-pywin32==308; platform_system=='Windows'
+pywin32==309; platform_system=='Windows'
 pyinstaller-versionfile==2.1.1; platform_system=='Windows' and python_version < '3.9'
 pyinstaller-versionfile==3.0.0; platform_system=='Windows' and python_version >= '3.9'
 libusb-package==1.0.26.1; platform_system=='Windows'
-tzdata==2024.2; platform_system=='Windows' and python_version >= '3.9' # to prevent pyinstaller WARNING: Hidden import "tzdata" not found!
+tzdata==2025.1; platform_system=='Windows' and python_version >= '3.9' # to prevent pyinstaller WARNING: Hidden import "tzdata" not found!