Skip to content

Commit

Permalink
Update to PySide6; runs locally
Browse files Browse the repository at this point in the history
  • Loading branch information
rdoddanavar committed Jan 15, 2025
1 parent cfa2859 commit f68efcb
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ pyyaml
tqdm
colorama
pyinstaller
pyqt5
pyside6
pyqtgraph
4 changes: 2 additions & 2 deletions src/gui/gui_common.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# System modules
import pathlib
import functools
from PyQt5.QtWidgets import(
from PySide6.QtWidgets import(
QLabel,
QPushButton,
QSpinBox,
QFileDialog,
QSizePolicy
)

from PyQt5.QtCore import Qt
from PySide6.QtCore import Qt
import pyqtgraph as pg

#------------------------------------------------------------------------------#
Expand Down
6 changes: 3 additions & 3 deletions src/gui/gui_elements.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy as np
import pathlib

from PyQt5.QtWidgets import(
from PySide6.QtWidgets import(
QLabel,
QMainWindow,
QPushButton,
Expand All @@ -19,11 +19,11 @@
QListWidget,
)

from PyQt5.QtGui import (
from PySide6.QtGui import (
QDoubleValidator
)

from PyQt5.QtCore import Qt
from PySide6.QtCore import Qt
import pyqtgraph as pg

# Project modules
Expand Down
4 changes: 2 additions & 2 deletions src/gui/gui_main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# System modules
from PyQt5.QtWidgets import QApplication
from PyQt5.QtGui import QFont
from PySide6.QtWidgets import QApplication
from PySide6.QtGui import QFont

# Project modules
import util_misc
Expand Down
2 changes: 1 addition & 1 deletion tools/pyinstaller_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
("src/util/config_unit.yml" , ".")]

# Excluded modules from bundle
excludes = ["PySide2", "PySide6", "PyQt6"] # Using PyQt5; Qt bindings conflict with each other
excludes = ["PySide2", "PyQt5", "PyQt6"] # Using PySide6; Qt bindings conflict with each other

# Hidden imports to resolve python environment inconsistencies
if os.name == "posix":
Expand Down

0 comments on commit f68efcb

Please sign in to comment.