diff --git a/b_asic/GUI/about_window.py b/b_asic/GUI/about_window.py
index 699e1b7cbbd8e1b1929ad7fe44df7b88238526ae..e7be9386df8943069e46364a91758f6958ffd74a 100644
--- a/b_asic/GUI/about_window.py
+++ b/b_asic/GUI/about_window.py
@@ -1,5 +1,5 @@
-from PySide2.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QDialog, QLabel, QFrame, QScrollArea
-from PySide2.QtCore import Qt
+from qtpy.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QDialog, QLabel, QFrame, QScrollArea
+from qtpy.QtCore import Qt
QUESTIONS = {
diff --git a/b_asic/GUI/arrow.py b/b_asic/GUI/arrow.py
index 7df52d052a209921b6592d3dd581a8fe3cefd83e..c598374d41d2726e8e44ca9bd1d20dc3a6e6114f 100644
--- a/b_asic/GUI/arrow.py
+++ b/b_asic/GUI/arrow.py
@@ -1,9 +1,9 @@
-from PySide2.QtWidgets import QApplication, QWidget, QMainWindow, QLabel, QAction,\
+from qtpy.QtWidgets import QApplication, QWidget, QMainWindow, QLabel, QAction,\
QStatusBar, QMenuBar, QLineEdit, QPushButton, QSlider, QScrollArea, QVBoxLayout,\
QHBoxLayout, QDockWidget, QToolBar, QMenu, QLayout, QSizePolicy, QListWidget, QListWidgetItem,\
QGraphicsLineItem, QGraphicsWidget
-from PySide2.QtCore import Qt, QSize, QLineF, QPoint, QRectF
-from PySide2.QtGui import QIcon, QFont, QPainter, QPen
+from qtpy.QtCore import Qt, QSize, QLineF, QPoint, QRectF
+from qtpy.QtGui import QIcon, QFont, QPainter, QPen
from b_asic.signal import Signal
diff --git a/b_asic/GUI/drag_button.py b/b_asic/GUI/drag_button.py
index a1d8118e094bd80d9c37c838e56b6746969b4453..52d8416b7fbcefcabc60c57373135cd95df52dc8 100644
--- a/b_asic/GUI/drag_button.py
+++ b/b_asic/GUI/drag_button.py
@@ -8,9 +8,9 @@ import os.path
from b_asic.GUI.properties_window import PropertiesWindow
from b_asic.GUI.utils import decorate_class, handle_error
-from PySide2.QtWidgets import QPushButton, QMenu, QAction
-from PySide2.QtCore import Qt, QSize, Signal
-from PySide2.QtGui import QIcon
+from qtpy.QtWidgets import QPushButton, QMenu, QAction
+from qtpy.QtCore import Qt, QSize, Signal
+from qtpy.QtGui import QIcon
@decorate_class(handle_error)
diff --git a/b_asic/GUI/gui_interface.py b/b_asic/GUI/gui_interface.py
index bfbe76f41595c93a48a9c35215ca70aad00a83ce..4fbb5c4ad14622a8a86cd37cfa114c72079d0660 100644
--- a/b_asic/GUI/gui_interface.py
+++ b/b_asic/GUI/gui_interface.py
@@ -7,7 +7,7 @@
# WARNING! All changes made in this file will be lost!
-from PySide2 import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
class Ui_main_window(object):
diff --git a/b_asic/GUI/main_window.py b/b_asic/GUI/main_window.py
index 1f4261fc39e1b92bbb028dae359cbcd8489f3ca4..d53ead66c19df1513fb86e7039614ea5b578508a 100644
--- a/b_asic/GUI/main_window.py
+++ b/b_asic/GUI/main_window.py
@@ -32,13 +32,13 @@ from b_asic.save_load_structure import *
from numpy import linspace
-from PySide2.QtWidgets import QApplication, QWidget, QMainWindow, QLabel, QAction,\
+from qtpy.QtWidgets import QApplication, QWidget, QMainWindow, QLabel, QAction,\
QStatusBar, QMenuBar, QLineEdit, QPushButton, QSlider, QScrollArea, QVBoxLayout,\
QHBoxLayout, QDockWidget, QToolBar, QMenu, QLayout, QSizePolicy, QListWidget,\
QListWidgetItem, QGraphicsView, QGraphicsScene, QShortcut, QGraphicsTextItem,\
QGraphicsProxyWidget, QInputDialog, QTextEdit, QFileDialog
-from PySide2.QtCore import Qt, QSize, QFileInfo
-from PySide2.QtGui import QIcon, QFont, QPainter, QPen, QBrush, QKeySequence
+from qtpy.QtCore import Qt, QSize, QFileInfo
+from qtpy.QtGui import QIcon, QFont, QPainter, QPen, QBrush, QKeySequence
MIN_WIDTH_SCENE = 600
diff --git a/b_asic/GUI/port_button.py b/b_asic/GUI/port_button.py
index a856b618578c6e271c8717a7e9d6e2bb78a62b67..6e9b206574a6c15ddf7eb53185014c231064b9c1 100644
--- a/b_asic/GUI/port_button.py
+++ b/b_asic/GUI/port_button.py
@@ -1,8 +1,8 @@
import sys
-from PySide2.QtWidgets import QPushButton, QMenu
-from PySide2.QtCore import Qt, Signal
+from qtpy.QtWidgets import QPushButton, QMenu
+from qtpy.QtCore import Qt, Signal
class PortButton(QPushButton):
diff --git a/b_asic/GUI/properties_window.py b/b_asic/GUI/properties_window.py
index 3c690517d446b9131df63d06413698e25e13820e..7ad87c0b1de31175bc2a3649ee5a6d50e5cb3efc 100644
--- a/b_asic/GUI/properties_window.py
+++ b/b_asic/GUI/properties_window.py
@@ -1,7 +1,7 @@
-from PySide2.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
+from qtpy.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
QLabel, QCheckBox, QGridLayout
-from PySide2.QtCore import Qt
-from PySide2.QtGui import QDoubleValidator
+from qtpy.QtCore import Qt
+from qtpy.QtGui import QDoubleValidator
class PropertiesWindow(QDialog):
diff --git a/b_asic/GUI/select_sfg_window.py b/b_asic/GUI/select_sfg_window.py
index 1b70c2c27f066f8ab28808673d347eec717f1e5c..2901213ec06a571de01bf6ae32178bf004496c12 100644
--- a/b_asic/GUI/select_sfg_window.py
+++ b/b_asic/GUI/select_sfg_window.py
@@ -1,7 +1,7 @@
-from PySide2.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
+from qtpy.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
QLabel, QCheckBox, QSpinBox, QGroupBox, QFrame, QFormLayout, QGridLayout, QSizePolicy, QFileDialog, QShortcut, QComboBox
-from PySide2.QtCore import Qt, Signal
-from PySide2.QtGui import QIntValidator, QKeySequence
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtGui import QIntValidator, QKeySequence
from matplotlib.backends import qt_compat
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
diff --git a/b_asic/GUI/show_pc_window.py b/b_asic/GUI/show_pc_window.py
index 1cc879397f726c343350ea33483e5850404b851b..3b74f36215f75e9f5d4409cc05773c163a12a1ea 100644
--- a/b_asic/GUI/show_pc_window.py
+++ b/b_asic/GUI/show_pc_window.py
@@ -1,8 +1,8 @@
from b_asic.signal_flow_graph import SFG
-from PySide2.QtWidgets import QDialog, QPushButton, QVBoxLayout, QCheckBox,\
+from qtpy.QtWidgets import QDialog, QPushButton, QVBoxLayout, QCheckBox,\
QFrame, QFormLayout
-from PySide2.QtCore import Qt, Signal
+from qtpy.QtCore import Qt, Signal
class ShowPCWindow(QDialog):
diff --git a/b_asic/GUI/simulate_sfg_window.py b/b_asic/GUI/simulate_sfg_window.py
index f787e1ce25c0881ffdc5fa0c238ead0a971c3d61..e609048133712432b8748f4eb7a59bec7bf597ea 100644
--- a/b_asic/GUI/simulate_sfg_window.py
+++ b/b_asic/GUI/simulate_sfg_window.py
@@ -1,7 +1,7 @@
-from PySide2.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
+from qtpy.QtWidgets import QDialog, QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout,\
QLabel, QCheckBox, QSpinBox, QGroupBox, QFrame, QFormLayout, QGridLayout, QSizePolicy, QFileDialog, QShortcut
-from PySide2.QtCore import Qt, Signal
-from PySide2.QtGui import QDoubleValidator, QKeySequence
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtGui import QDoubleValidator, QKeySequence
from matplotlib.backends import qt_compat
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
diff --git a/b_asic/GUI/utils.py b/b_asic/GUI/utils.py
index 5234c6548bbbc66eb224fb9d3d3835d67a099213..f98ec70c9e35f6cf8aa65d37d7a79b0bfc16e0d1 100644
--- a/b_asic/GUI/utils.py
+++ b/b_asic/GUI/utils.py
@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import QErrorMessage
+from qtpy.QtWidgets import QErrorMessage
from traceback import format_exc
def handle_error(fn):
diff --git a/setup.py b/setup.py
index e58603441c1c1c95a5870ce79f7a660fe025eaad..42adeb79afbd80b1fda1db4cdc36cc911cb9379d 100644
--- a/setup.py
+++ b/setup.py
@@ -61,13 +61,13 @@ class CMakeBuild(build_ext):
setuptools.setup(
name="b-asic",
- version="1.0.0",
- author="Adam Jakobsson, Angus Lothian, Arvid Westerlund, Felix Goding, Ivar Härnqvist, Jacob Wahlman, Kevin Scott, Rasmus Karlsson",
- author_email="adaja901@student.liu.se, anglo547@student.liu.se, arvwe160@student.liu.se, felgo673@student.liu.se, ivaha717@student.liu.se, jacwa448@student.liu.se, kevsc634@student.liu.se, raska119@student.liu.se",
+ version="1.0.1-beta",
+ author="Adam Jakobsson, Angus Lothian, Arvid Westerlund, Felix Goding, Ivar Härnqvist, Jacob Wahlman, Kevin Scott, Rasmus Karlsson, Oscar Gustafsson",
+ author_email="adaja901@student.liu.se, anglo547@student.liu.se, arvwe160@student.liu.se, felgo673@student.liu.se, ivaha717@student.liu.se, jacwa448@student.liu.se, kevsc634@student.liu.se, raska119@student.liu.se, oscar.gustafsson@liu.se",
description="Better ASIC Toolbox",
long_description=open("README.md", "r").read(),
long_description_content_type="text/markdown",
- url="https://gitlab.liu.se/PUM_TDDD96/B-ASIC",
+ url="https://gitlab.liu.se/da/B-ASIC",
license="MIT",
classifiers=[
"Programming Language :: Python :: 3",
@@ -76,9 +76,10 @@ setuptools.setup(
],
python_requires=">=3.6",
install_requires=[
- "pybind11>=2.3.0",
"numpy",
+ "pybind11>=2.3.0",
"pyside2",
+ "qtpy",
"graphviz",
"matplotlib"
],