From 4015d39c157a5287ca925baf50e84d12d0c66159 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Mon, 3 Apr 2023 11:14:26 +0200 Subject: [PATCH] AYON: General issues (#4763) * move ayon api to common python vendor * fix PySide6 support --- ayon_start.py | 13 ------------- common/ayon_common/connection/ui/login_window.py | 16 ++++++++++------ common/ayon_common/connection/ui/widgets.py | 2 +- .../python/{ayon => common}/ayon_api/__init__.py | 0 .../python/{ayon => common}/ayon_api/_api.py | 0 .../{ayon => common}/ayon_api/constants.py | 0 .../{ayon => common}/ayon_api/entity_hub.py | 0 .../python/{ayon => common}/ayon_api/events.py | 0 .../{ayon => common}/ayon_api/exceptions.py | 0 .../python/{ayon => common}/ayon_api/graphql.py | 0 .../{ayon => common}/ayon_api/graphql_queries.py | 0 .../{ayon => common}/ayon_api/operations.py | 0 .../{ayon => common}/ayon_api/server_api.py | 0 .../{ayon => common}/ayon_api/thumbnails.py | 0 .../python/{ayon => common}/ayon_api/utils.py | 0 .../python/{ayon => common}/ayon_api/version.py | 0 16 files changed, 11 insertions(+), 20 deletions(-) rename openpype/vendor/python/{ayon => common}/ayon_api/__init__.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/_api.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/constants.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/entity_hub.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/events.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/exceptions.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/graphql.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/graphql_queries.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/operations.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/server_api.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/thumbnails.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/utils.py (100%) rename openpype/vendor/python/{ayon => common}/ayon_api/version.py (100%) diff --git a/ayon_start.py b/ayon_start.py index 1e791f4f4f..11677b4415 100644 --- a/ayon_start.py +++ b/ayon_start.py @@ -96,19 +96,6 @@ else: sys.path.append(_dependencies_path) _python_paths.append(_dependencies_path) -# ------------------------------------------------- -# Temporary solution to add ayon_api to python path -# ------------------------------------------------- -# This is to avoid need of new build & release when ayon-python-api is updated. -ayon_dependency_dir = os.path.join( - AYON_ROOT, "openpype", "vendor", "python", "ayon" -) -if ayon_dependency_dir in _python_paths: - _python_paths.remove(ayon_dependency_dir) -_python_paths.insert(0, _dependencies_path) -sys.path.insert(0, ayon_dependency_dir) -# ------------------------------------------------- - # Vendored python modules that must not be in PYTHONPATH environment but # are required for OpenPype processes sys.path.insert(0, os.path.join(AYON_ROOT, "vendor", "python")) diff --git a/common/ayon_common/connection/ui/login_window.py b/common/ayon_common/connection/ui/login_window.py index f2604f0466..d7c0558eec 100644 --- a/common/ayon_common/connection/ui/login_window.py +++ b/common/ayon_common/connection/ui/login_window.py @@ -1,6 +1,6 @@ import traceback -from Qt import QtWidgets, QtCore, QtGui +from qtpy import QtWidgets, QtCore, QtGui from ayon_api.exceptions import UrlError from ayon_api.utils import validate_url, login_to_server @@ -171,7 +171,7 @@ class ServerLoginWindow(QtWidgets.QDialog): password_label = QtWidgets.QLabel("Password:", user_cred_widget) password_input = PlaceholderLineEdit(user_cred_widget) password_input.setPlaceholderText("< *********** >") - password_input.setEchoMode(password_input.Password) + password_input.setEchoMode(PlaceholderLineEdit.Password) api_label = QtWidgets.QLabel("API key:", user_cred_widget) api_preview = QtWidgets.QLineEdit(user_cred_widget) @@ -405,14 +405,18 @@ class ServerLoginWindow(QtWidgets.QDialog): def _center_window(self): """Move window to center of screen.""" - desktop = QtWidgets.QApplication.desktop() - screen_idx = desktop.screenNumber(self) - screen_geo = desktop.screenGeometry(screen_idx) + if hasattr(QtWidgets.QApplication, "desktop"): + desktop = QtWidgets.QApplication.desktop() + screen_idx = desktop.screenNumber(self) + screen_geo = desktop.screenGeometry(screen_idx) + else: + screen = self.screen() + screen_geo = screen.geometry() + geo = self.frameGeometry() geo.moveCenter(screen_geo.center()) if geo.y() < screen_geo.y(): geo.setY(screen_geo.y()) - self.move(geo.topLeft()) def _on_url_change(self, text): diff --git a/common/ayon_common/connection/ui/widgets.py b/common/ayon_common/connection/ui/widgets.py index 04c6a8e5f2..78b73e056d 100644 --- a/common/ayon_common/connection/ui/widgets.py +++ b/common/ayon_common/connection/ui/widgets.py @@ -1,4 +1,4 @@ -from Qt import QtWidgets, QtCore, QtGui +from qtpy import QtWidgets, QtCore, QtGui class PressHoverButton(QtWidgets.QPushButton): diff --git a/openpype/vendor/python/ayon/ayon_api/__init__.py b/openpype/vendor/python/common/ayon_api/__init__.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/__init__.py rename to openpype/vendor/python/common/ayon_api/__init__.py diff --git a/openpype/vendor/python/ayon/ayon_api/_api.py b/openpype/vendor/python/common/ayon_api/_api.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/_api.py rename to openpype/vendor/python/common/ayon_api/_api.py diff --git a/openpype/vendor/python/ayon/ayon_api/constants.py b/openpype/vendor/python/common/ayon_api/constants.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/constants.py rename to openpype/vendor/python/common/ayon_api/constants.py diff --git a/openpype/vendor/python/ayon/ayon_api/entity_hub.py b/openpype/vendor/python/common/ayon_api/entity_hub.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/entity_hub.py rename to openpype/vendor/python/common/ayon_api/entity_hub.py diff --git a/openpype/vendor/python/ayon/ayon_api/events.py b/openpype/vendor/python/common/ayon_api/events.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/events.py rename to openpype/vendor/python/common/ayon_api/events.py diff --git a/openpype/vendor/python/ayon/ayon_api/exceptions.py b/openpype/vendor/python/common/ayon_api/exceptions.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/exceptions.py rename to openpype/vendor/python/common/ayon_api/exceptions.py diff --git a/openpype/vendor/python/ayon/ayon_api/graphql.py b/openpype/vendor/python/common/ayon_api/graphql.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/graphql.py rename to openpype/vendor/python/common/ayon_api/graphql.py diff --git a/openpype/vendor/python/ayon/ayon_api/graphql_queries.py b/openpype/vendor/python/common/ayon_api/graphql_queries.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/graphql_queries.py rename to openpype/vendor/python/common/ayon_api/graphql_queries.py diff --git a/openpype/vendor/python/ayon/ayon_api/operations.py b/openpype/vendor/python/common/ayon_api/operations.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/operations.py rename to openpype/vendor/python/common/ayon_api/operations.py diff --git a/openpype/vendor/python/ayon/ayon_api/server_api.py b/openpype/vendor/python/common/ayon_api/server_api.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/server_api.py rename to openpype/vendor/python/common/ayon_api/server_api.py diff --git a/openpype/vendor/python/ayon/ayon_api/thumbnails.py b/openpype/vendor/python/common/ayon_api/thumbnails.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/thumbnails.py rename to openpype/vendor/python/common/ayon_api/thumbnails.py diff --git a/openpype/vendor/python/ayon/ayon_api/utils.py b/openpype/vendor/python/common/ayon_api/utils.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/utils.py rename to openpype/vendor/python/common/ayon_api/utils.py diff --git a/openpype/vendor/python/ayon/ayon_api/version.py b/openpype/vendor/python/common/ayon_api/version.py similarity index 100% rename from openpype/vendor/python/ayon/ayon_api/version.py rename to openpype/vendor/python/common/ayon_api/version.py