try to use pyside6.6

danielhrisca · Oct 19, 2023 · 765da75 · 765da75
1 parent 12fc691
commit 765da75
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -6,4 +6,4 @@ pandas
 typing_extensions
 python-dateutil
 isal; platform_machine == "x86_64" or platform_machine == "AMD64"
-lxml<=4.9.2
+lxml>=4.9.3
diff --git a/requirements_exe_build.txt b/requirements_exe_build.txt
@@ -5,11 +5,11 @@ numpy>=1.23.0
 pandas
 typing_extensions
 isal; platform_machine == "x86_64" or platform_machine == "AMD64"
-lxml<=4.9.2
+lxml==4.9.3
 natsort 
 psutil 
-PySide6==6.2.2
-pyqtgraph==0.12.4
+PySide6==6.6.0
+pyqtgraph==0.13.3
 QtPy==2.3.1
 pyqtlet2
 pyopengl
@@ -21,7 +21,7 @@ cChardet==2.1.5
 chardet
 cryptography
 keyring
-pyinstaller<6.0; sys_platform=="win32"
+pyinstaller; sys_platform=="win32"
 pyinstaller<6.0; sys_platform=="darwin"
 pyinstaller==4.10; sys_platform=="linux"
 scipy

diff --git a/src/asammdf/__init__.py b/src/asammdf/__init__.py
@@ -2,6 +2,7 @@
 
 import logging
 
+
 logger = logging.getLogger("asammdf")
 formatter = logging.Formatter("%(name)s - %(levelname)s - %(message)s")
 console = logging.StreamHandler()

diff --git a/src/asammdf/gui/__init__.py b/src/asammdf/gui/__init__.py
@@ -0,0 +1 @@
+
diff --git a/src/asammdf/gui/asammdfgui.py b/src/asammdf/gui/asammdfgui.py
@@ -5,6 +5,7 @@
 os.environ["QT_API"] = "pyside6"
 os.environ["PYQTGRAPH_QT_LIB"] = "PySide6"
 os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "0"
+os.environ["PYSIDE6_OPTION_PYTHON_ENUM"] = "2"
 
 alternative_sitepacakges = os.environ.get("ASAMMDF_PYTHONPATH", "")
 

diff --git a/src/asammdf/gui/widgets/main.py b/src/asammdf/gui/widgets/main.py
@@ -10,6 +10,7 @@
 from natsort import natsorted
 import pyqtgraph as pg
 from PySide6 import QtCore, QtGui, QtWidgets
+from PySide6 import __version__ as pyside6_version
 
 from ...version import __version__ as libversion
 from ..dialogs.bus_database_manager import BusDatabaseManagerDialog
@@ -1489,6 +1490,7 @@ def show_about(self):
     <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Build information:</p>
     <ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;">
     <li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">version {libversion}</li>
+    <li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">PySide6 {pyside6_version}</li>
     <li style=" font-family:'MS Shell Dlg 2'; font-size:8pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">CPython {cpython}</li></ul>
     <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
     <p>Copyright © 2018-2023 Daniel Hrisca</p></body></html>""",

diff --git a/src/asammdf/version.py b/src/asammdf/version.py
@@ -1,3 +1,3 @@
 """ asammdf version module """
 
-__version__ = "7.3.15"
+__version__ = "7.3.16.dev1"