diff --git a/environment.yml b/environment.yml index e769a84f..d266b888 100644 --- a/environment.yml +++ b/environment.yml @@ -19,8 +19,7 @@ dependencies: - pydata-sphinx-theme - lmfit # needed into TRR - h5py # needed into TRR (should be removed to use I/O methods of containers) - - pyqt # [linux] - - pyside6 # [osx and arm64] + - pyqt - pyqtgraph - pip: - zeo diff --git a/pyproject.toml b/pyproject.toml index 4e3124e4..24d4682e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,8 +29,8 @@ dependencies = [ "zeo", "lmfit", "h5py", - 'pyqt5 ; platform_system == "Linux"', - 'pyqt6 ; platform_system != "Linux"', # for macOS + 'pyqt5', + # 'pyqt6 ; platform_system != "Linux"', # for macOS "pyqtgraph", ] diff --git a/src/nectarchain/trr_test_suite/gui.py b/src/nectarchain/trr_test_suite/gui.py index 36789451..1dea5516 100644 --- a/src/nectarchain/trr_test_suite/gui.py +++ b/src/nectarchain/trr_test_suite/gui.py @@ -4,49 +4,26 @@ import sys import tempfile +from matplotlib.backends.backend_qt5 import NavigationToolbar2QT as NavigationToolbar from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas from matplotlib.figure import Figure - -try: - from matplotlib.backends.backend_qt import NavigationToolbar2QT as NavigationToolbar - from PyQt6.QtCore import QProcess, QTimer - from PyQt6.QtWidgets import ( - QApplication, - QComboBox, - QGroupBox, - QHBoxLayout, - QLabel, - QLineEdit, - QMessageBox, - QPushButton, - QSizePolicy, - QSpacerItem, - QTextEdit, - QVBoxLayout, - QWidget, - QWidgetItem, - ) -except ImportError: - from PyQt5.QtCore import QProcess, QTimer - from PyQt5.QtWidgets import ( - QApplication, - QComboBox, - QGroupBox, - QHBoxLayout, - QLabel, - QLineEdit, - QMessageBox, - QPushButton, - QSizePolicy, - QSpacerItem, - QTextEdit, - QVBoxLayout, - QWidget, - QWidgetItem, - ) - from matplotlib.backends.backend_qt5 import ( - NavigationToolbar2QT as NavigationToolbar, - ) +from PyQt5.QtCore import QProcess, QTimer +from PyQt5.QtWidgets import ( + QApplication, + QComboBox, + QGroupBox, + QHBoxLayout, + QLabel, + QLineEdit, + QMessageBox, + QPushButton, + QSizePolicy, + QSpacerItem, + QTextEdit, + QVBoxLayout, + QWidget, + QWidgetItem, +) import nectarchain.trr_test_suite.deadtime as deadtime import nectarchain.trr_test_suite.linearity as linearity