Used qtpy to allow both PySide2 and PyQt5 to be used

b_asic/GUI/about_window.py

-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 = {

b_asic/GUI/arrow.py

-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
 

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)

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):

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

b_asic/GUI/port_button.py

 
 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):

b_asic/GUI/properties_window.py

-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):

b_asic/GUI/select_sfg_window.py

-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

b_asic/GUI/show_pc_window.py

 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):

b_asic/GUI/simulate_sfg_window.py

-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

b_asic/GUI/utils.py

-from PySide2.QtWidgets import QErrorMessage
+from qtpy.QtWidgets import QErrorMessage
 from traceback import format_exc
 
 def handle_error(fn):

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"
     ],