Skip to content

Commit

Permalink
updated libs, switched to PySide2
Browse files Browse the repository at this point in the history
  • Loading branch information
tobi committed Oct 28, 2019
1 parent 53d0f83 commit de9f13e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 29 deletions.
14 changes: 1 addition & 13 deletions BlenderUpdater.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,7 @@
import mainwindow
import setstyle

if getattr(
sys, "frozen", False
): # Do a check if running from frozen application or .py script
try: # when frozen, try PySide2 first, then PyQt5. Frozen application fails to run when using Qt.py
from PySide2 import QtWidgets, QtCore, QtGui
except ImportError:
from PyQt5 import QtWidgets, QtCore, QtGui
else: # when running from script, use the Qt.py shim
from Qt import (
QtWidgets,
QtCore,
QtGui,
) # pylint: disable=no-name-in-module,import-error
from PySide2 import QtWidgets, QtCore, QtGui

app = QtWidgets.QApplication(sys.argv)
appversion = "1.9.5"
Expand Down
3 changes: 2 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ name = "pypi"
requests = "*"
"pyside2" = "*"
"bs4" = "*"
"qt.py" = "*"
"urllib3" = "*"
nuitka = "*"
qt-py = "*"

[dev-packages]
pyinstaller = "*"
Expand Down
32 changes: 19 additions & 13 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mainwindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# WARNING! All changes made in this file will be lost!

from Qt import QtCore, QtGui, QtWidgets
from PySide2 import QtCore, QtGui, QtWidgets

class Ui_MainWindow(object):
def setupUi(self, MainWindow):
Expand Down
2 changes: 1 addition & 1 deletion setstyle.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from Qt import QtGui
from PySide2 import QtGui


def setPalette():
Expand Down

0 comments on commit de9f13e

Please sign in to comment.