- fixes Issue #1054

- lib updates

src/artisanlib/axis.py

@@ -80,7 +80,7 @@ def __init__(self, parent = None, aw = None):
         step100Label = QLabel(QApplication.translate('Label', '100% Event Step'))
         self.step100Edit = QLineEdit()
         self.step100Edit.setMaximumWidth(55)
-        self.step100Edit.setValidator(QIntValidator(self.aw.qmc.ylimit_min_max, 999999, self.step100Edit))
+        self.step100Edit.setValidator(QIntValidator(int(self.aw.qmc.ylimit_min_max), 999999, self.step100Edit))
         self.step100Edit.setAlignment(Qt.AlignmentFlag.AlignRight)
         self.step100Edit.setToolTip(QApplication.translate('Tooltip', '100% event values in step mode are aligned with the given y-axis value or the lowest phases limit if left empty'))
         self.step100Edit.editingFinished.connect(self.step100Changed)
@@ -99,16 +99,16 @@ def __init__(self, parent = None, aw = None):
         self.ylimitEdit.setMaximumWidth(60)
         self.ylimitEdit_min = QLineEdit()
         self.ylimitEdit_min.setMaximumWidth(60)
-        self.ylimitEdit.setValidator(QIntValidator(self.aw.qmc.ylimit_min_max, self.aw.qmc.ylimit_max, self.ylimitEdit))
-        self.ylimitEdit_min.setValidator(QIntValidator(self.aw.qmc.ylimit_min_max, self.aw.qmc.ylimit_max, self.ylimitEdit_min))
+        self.ylimitEdit.setValidator(QIntValidator(int(self.aw.qmc.ylimit_min_max), int(self.aw.qmc.ylimit_max), self.ylimitEdit))
+        self.ylimitEdit_min.setValidator(QIntValidator(int(self.aw.qmc.ylimit_min_max), int(self.aw.qmc.ylimit_max), self.ylimitEdit_min))
         self.ylimitEdit.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
         self.ylimitEdit_min.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
         self.zlimitEdit = QLineEdit()
         self.zlimitEdit.setMaximumWidth(60)
         self.zlimitEdit_min = QLineEdit()
         self.zlimitEdit_min.setMaximumWidth(60)
-        self.zlimitEdit.setValidator(QIntValidator(self.aw.qmc.zlimit_min_max, self.aw.qmc.zlimit_max, self.zlimitEdit))
-        self.zlimitEdit_min.setValidator(QIntValidator(self.aw.qmc.zlimit_min_max, self.aw.qmc.zlimit_max, self.zlimitEdit_min))
+        self.zlimitEdit.setValidator(QIntValidator(int(self.aw.qmc.zlimit_min_max), int(self.aw.qmc.zlimit_max), self.zlimitEdit))
+        self.zlimitEdit_min.setValidator(QIntValidator(int(self.aw.qmc.zlimit_min_max), int(self.aw.qmc.zlimit_max), self.zlimitEdit_min))
         self.zlimitEdit.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
         self.zlimitEdit_min.setAlignment(Qt.AlignmentFlag.AlignRight|Qt.AlignmentFlag.AlignTrailing|Qt.AlignmentFlag.AlignVCenter)
         self.xlimitEdit.setText(stringfromseconds(self.aw.qmc.endofx))

src/artisanlib/pid_dialogs.py

@@ -1264,9 +1264,9 @@ def __init__(self, parent = None, aw = None):
         self.pedit.setMaximumWidth(60)
         self.iedit.setMaximumWidth(60)
         self.dedit.setMaximumWidth(60)
-        self.pedit.setValidator(QIntValidator(0., 999, self.pedit))
+        self.pedit.setValidator(QIntValidator(0, 999, self.pedit))
         self.iedit.setValidator(QIntValidator(0, 3200, self.iedit))
-        self.dedit.setValidator(QIntValidator(0., 999, self.dedit))
+        self.dedit.setValidator(QIntValidator(0, 999, self.dedit))
         button_autotuneON = QPushButton(QApplication.translate('Button','Autotune ON'))
         button_autotuneON.setFocusPolicy(Qt.FocusPolicy.NoFocus)
         button_autotuneOFF = QPushButton(QApplication.translate('Button','Autotune OFF'))

src/requirements-linux.txt

@@ -26,7 +26,7 @@ openpyxl==3.0.10 #3.0.9
 pyinstaller==5.7.0 #5.6.2 # binary build with pyinstaller 4.8 fails on setuptools==60.7.0/60.7.1
 #jeepney==0.4
 #cryptography==2.6.1
-keyring==23.11.0 #23.9.3  # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
+keyring==23.13.1 #23.9.3  # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
 SecretStorage==3.3.3 #3.3.1
 lxml==4.9.1 #4.7.1
 prettytable==3.5.0 #3.4.1 # >1.0.0 fail to be packed by py2app, but a monkey patch in main.py helps

src/requirements-macos-legacy.txt

@@ -26,6 +26,6 @@ PyQtWebEngine==5.15.6 #5.15.5
 #PyQt6==6.2.3 # Qt6 not supported on macOS 10.13
 #PyQt6-WebEngine==6.2.1 # Qt6 not supported on macOS 10.13
 openpyxl==3.0.10 #3.0.9
-keyring==23.11.0 #23.9.3 # builds using 19.3.0 and 20.0.0 fail with py2app/pyinstaller, 21.21 seems to have fixed this
+keyring==23.13.1 #23.9.3 # builds using 19.3.0 and 20.0.0 fail with py2app/pyinstaller, 21.21 seems to have fixed this
 prettytable==3.5.0 #3.4.1 # >1.0.0 fail to be packed, but a main.py monkey patch helps
 lxml==4.9.1 #4.7.1

src/requirements-macos.txt

@@ -2,8 +2,8 @@
 # platform specifics:
 #
 appnope==0.1.3
-pyobjc-core==9.0 #8.5.1 #8.5
-pyobjc-framework-Cocoa==9.0 #8.5.1 #8.5
+pyobjc-core==9.0.1 #8.5.1 #8.5
+pyobjc-framework-Cocoa==9.0.1 #8.5.1 #8.5
 py2app==0.28.4 #0.23 # we stay on 0.23 due to our darkmode patch which needs to be redone for later ersions like 0.24 to avoid the patch to be overwritten
 # NOTE: py2app is installed again for builds from custom wheel via .ci/install-osx.sh to allow for dark mode support
 py-cpuinfo==9.0.0 #8.0.0 # used for proper CPU arch detection running under Rosetta2
@@ -24,6 +24,6 @@ colorspacious==1.1.2 # depends on numpy thus we have to put it after numpy
 PyQt6==6.4.0 #6.3.1
 PyQt6-WebEngine==6.4.0 #6.3.1
 openpyxl==3.0.10 #3.0.9
-keyring==23.11.0 #23.6.0 # builds using 19.3.0 and 20.0.0 fail with py2app/pyinstaller, 21.21 seems to have fixed this
+keyring==23.13.1 #23.6.0 # builds using 19.3.0 and 20.0.0 fail with py2app/pyinstaller, 21.21 seems to have fixed this
 prettytable==3.5.0 #3.4.1 # >1.0.0 fail to be packed, but a main.py monkey patch helps
 lxml==4.9.1 # 4.6.4

src/requirements-rpi-bullseye.txt

@@ -9,7 +9,7 @@
 ######
 # platform specifics
 #
-distro==1.7.0 #1.6.0
+distro==1.8.0 #1.6.0
 # and SecretStorage (see below)
 #
 ######
@@ -27,10 +27,10 @@ openpyxl==3.0.10 #3.0.9
 #PyQt 5.15.2 is preinstalled
 #PyQtWebEngine==5.15.5 # not available for 32bit platforms
 # what about
-pyinstaller==5.6.2 #5.4.1 #4.9
-cffi==1.15.0
+pyinstaller==5.7.0 #5.6.2 #5.4.1 #4.9
+cffi==1.15.1
 cryptography==3.4.8
-keyring==23.11.0 #23.9.3 # versions beyond 23.0.1 require importlib_metadata >=v3.6 (RPi buster comes with v2.0)
+keyring==23.13.1 #23.9.3 # versions beyond 23.0.1 require importlib_metadata >=v3.6 (RPi buster comes with v2.0)
 SecretStorage==3.3.3 #3.3.1
 lxml==4.9.1 #4.7.1
 prettytable==0.7.2 # >1.0.0 fail to be packed and the monkey patch in main.py does not help here due the old python version

src/requirements-win-legacy.txt

@@ -26,6 +26,6 @@ colorspacious==1.1.2 # depends on numpy thus we have to put it after numpy
 PyQt5==5.15.7 #5.15.6
 PyQtWebEngine==5.15.6 #5.15.5
 openpyxl==3.0.10 #3.0.9
-keyring==23.11.0 #23.9.3 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
+keyring==23.13.1 #23.9.3 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
 lxml==4.9.2 #4.7.1
 prettytable==3.5.0 #3.4.1 # >1.0.0 fail to be packed by py2app, but a monkey patch in main.py helps

src/requirements-win.txt

@@ -27,6 +27,6 @@ PyQt6==6.4.0 #6.3.1
 PyQt6-WebEngine==6.4.0 #6.3.1
 PyQt6-Qt6==6.4.0  #revert from 6.4.1 installed by PyQt6 to mitigate Qt scaling changes
 openpyxl==3.0.10 #3.0.9
-keyring==23.11.0 #23.9.3 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
+keyring==23.13.1 #23.9.3 # builds with 19.3.0 and 20.0.0 fail with py2app/pyinstaller
 lxml==4.9.2 #4.7.1
 prettytable==3.5.0 #3.4.1 # >1.0.0 fail to be packed by py2app, but a monkey patch in main.py helps

wiki/ReleaseHistory.md

@@ -45,6 +45,7 @@ v2.8.2 (December 21, 2022)
   - fixes Artisan Command `pidSource(<int>)`
   - fixes Phidget 1046 configuration
   - fixes regression which blocked background left/right shifts if keyboard moves was active
+  - fixes regression which crashed the Fuji PXR PID dialog ([Issue #1054](../../../issues/1054))
 * REMOVALS
    - drops builds for RPi Buster