pyside2 -> pyside6
This commit is contained in:
@@ -4,9 +4,9 @@ from src.version import version
|
||||
|
||||
install_requires = [
|
||||
"requests==2.26.0",
|
||||
"pyside2==5.15.2",
|
||||
"PySide6==6.2.0",
|
||||
"toml==0.10.2",
|
||||
"pillow==8.3.1",
|
||||
"pillow==8.3.2",
|
||||
"pyaoaddons==0.2.7.dev"
|
||||
]
|
||||
|
||||
|
||||
+1
-2
@@ -19,7 +19,6 @@ if TEST_ENV_ENABLED:
|
||||
test_type = os.getenv('TESTING')
|
||||
|
||||
if test_type not in _test_types:
|
||||
raise Exception('Unavailable GUI test type, avaliable values: {}'.format(
|
||||
','.join(_test_types.keys())))
|
||||
raise Exception(f'Unavailable GUI test type: {test_type}, avaliable values: {",".join(_test_types.keys())}')
|
||||
|
||||
TEST_TYPE = _test_types[test_type.lower()]
|
||||
|
||||
+6
-6
@@ -3,12 +3,12 @@ import platform
|
||||
import sys
|
||||
import requests
|
||||
|
||||
from PySide2 import QtCore # type: ignore
|
||||
from PySide2.QtCore import Qt # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide2.QtWidgets import QApplication # type: ignore
|
||||
from PySide2.QtWidgets import QMessageBox # type: ignore
|
||||
from PySide2.QtWidgets import QPushButton # type: ignore
|
||||
from PySide6 import QtCore # type: ignore
|
||||
from PySide6.QtCore import Qt # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
from PySide6.QtWidgets import QApplication # type: ignore
|
||||
from PySide6.QtWidgets import QMessageBox # type: ignore
|
||||
from PySide6.QtWidgets import QPushButton # type: ignore
|
||||
|
||||
from ..engine import InitializationResult
|
||||
from ..engine import initialize
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from PySide2.QtWidgets import QMessageBox # noqa type: ignore
|
||||
from PySide6.QtWidgets import QMessageBox # noqa type: ignore
|
||||
|
||||
from ...utils.version import get_version
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import sys
|
||||
import functools
|
||||
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide2.QtCore import Qt # type: ignore
|
||||
from PySide2.QtCore import QTimer # type: ignore
|
||||
from PySide2.QtWidgets import QComboBox # type: ignore
|
||||
from PySide2.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide2.QtWidgets import QPushButton # type: ignore
|
||||
from PySide2.QtWidgets import QVBoxLayout # type: ignore
|
||||
from PySide2.QtWidgets import QWidget # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
from PySide6.QtCore import Qt # type: ignore
|
||||
from PySide6.QtCore import QTimer # type: ignore
|
||||
from PySide6.QtWidgets import QComboBox # type: ignore
|
||||
from PySide6.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide6.QtWidgets import QPushButton # type: ignore
|
||||
from PySide6.QtWidgets import QVBoxLayout # type: ignore
|
||||
from PySide6.QtWidgets import QWidget # type: ignore
|
||||
|
||||
from ... import engine
|
||||
|
||||
@@ -62,7 +62,7 @@ class TopBar(QWidget):
|
||||
self.view_type = ViewTypeWidget()
|
||||
self.layout = QHBoxLayout()
|
||||
self.layout.setSpacing(0)
|
||||
self.layout.setMargin(0)
|
||||
self.layout.setContentsMargins(0, 0, 0, 0)
|
||||
self.layout.addWidget(self.view_type)
|
||||
|
||||
self.about_button = AboutButton()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
from PySide2.QtWidgets import QPushButton # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide6.QtWidgets import QPushButton # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
|
||||
from ....utils import assets
|
||||
from ....stats.list_item import PlayerListItem
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from io import BytesIO
|
||||
from PIL import Image, ImageQt # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
|
||||
from .....utils import async_request
|
||||
|
||||
|
||||
@@ -3,20 +3,20 @@ import functools
|
||||
import re
|
||||
from typing import List
|
||||
|
||||
from PySide2 import QtCore # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide2.QtCore import Qt # type: ignore
|
||||
from PySide2.QtGui import QStandardItem # type: ignore
|
||||
from PySide2.QtGui import QStandardItemModel # type: ignore
|
||||
from PySide2.QtWidgets import QApplication # type: ignore
|
||||
from PySide2.QtWidgets import QComboBox # type: ignore
|
||||
from PySide2.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide2.QtWidgets import QLabel # type: ignore
|
||||
from PySide2.QtWidgets import QListView # type: ignore
|
||||
from PySide2.QtWidgets import QMessageBox # type: ignore
|
||||
from PySide2.QtWidgets import QProgressBar # type: ignore
|
||||
from PySide2.QtWidgets import QPushButton # type: ignore
|
||||
from PySide2.QtWidgets import QVBoxLayout # type: ignore
|
||||
from PySide6 import QtCore # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
from PySide6.QtCore import Qt # type: ignore
|
||||
from PySide6.QtGui import QStandardItem # type: ignore
|
||||
from PySide6.QtGui import QStandardItemModel # type: ignore
|
||||
from PySide6.QtWidgets import QApplication # type: ignore
|
||||
from PySide6.QtWidgets import QComboBox # type: ignore
|
||||
from PySide6.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide6.QtWidgets import QLabel # type: ignore
|
||||
from PySide6.QtWidgets import QListView # type: ignore
|
||||
from PySide6.QtWidgets import QMessageBox # type: ignore
|
||||
from PySide6.QtWidgets import QProgressBar # type: ignore
|
||||
from PySide6.QtWidgets import QPushButton # type: ignore
|
||||
from PySide6.QtWidgets import QVBoxLayout # type: ignore
|
||||
|
||||
from .....stats.list_item import PlayerListItem
|
||||
from .....utils import assets
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
# from PySide2.QtCore import QTimer
|
||||
# from PySide2.QtCore import Qt
|
||||
# from PySide6.QtCore import QTimer
|
||||
# from PySide6.QtCore import Qt
|
||||
|
||||
from typing import Callable
|
||||
|
||||
from PySide2.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide2.QtWidgets import QVBoxLayout # type: ignore
|
||||
from PySide2.QtWidgets import QComboBox # type: ignore
|
||||
from PySide2.QtWidgets import QWidget # type: ignore
|
||||
from PySide6.QtWidgets import QHBoxLayout # type: ignore
|
||||
from PySide6.QtWidgets import QVBoxLayout # type: ignore
|
||||
from PySide6.QtWidgets import QComboBox # type: ignore
|
||||
from PySide6.QtWidgets import QWidget # type: ignore
|
||||
|
||||
from ....stats.list_item import PlayerListItem
|
||||
|
||||
@@ -56,7 +56,7 @@ class ModeBasedListView(QWidget):
|
||||
QWidget.__init__(self)
|
||||
self.layout = QVBoxLayout()
|
||||
self.layout.setSpacing(0)
|
||||
self.layout.setMargin(0)
|
||||
self.layout.setContentsMargins(0, 0, 0, 0)
|
||||
self.session_bar = SessionBar(clipboard)
|
||||
self.layout.addWidget(self.session_bar)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import datetime
|
||||
|
||||
from PySide2.QtWidgets import QLabel # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide2 import QtCore # type: ignore
|
||||
from PySide6.QtWidgets import QLabel # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
from PySide6 import QtCore # type: ignore
|
||||
|
||||
from src.utils import assets, number
|
||||
from src.stats.list_item import PlayerListItem
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
|
||||
from typing import Callable
|
||||
|
||||
from PySide2.QtWidgets import QPushButton # type: ignore
|
||||
from PySide2 import QtGui # type: ignore
|
||||
from PySide6.QtWidgets import QPushButton # type: ignore
|
||||
from PySide6 import QtGui # type: ignore
|
||||
|
||||
from ....utils import assets
|
||||
from ....stats.list_item import PlayerListItem
|
||||
|
||||
Reference in New Issue
Block a user