diff --git a/igniter/install_dialog.py b/igniter/install_dialog.py index 9bcea5f215..93c94977c6 100644 --- a/igniter/install_dialog.py +++ b/igniter/install_dialog.py @@ -19,6 +19,8 @@ class InstallDialog(QtWidgets.QDialog): def __init__(self, parent=None): super(InstallDialog, self).__init__(parent) + self._mongo_url = "" + self.setWindowTitle("Pype - Configure Pype repository path") self._icon_path = os.path.join( os.path.dirname(__file__), 'pype_icon.png') @@ -147,10 +149,10 @@ class InstallDialog(QtWidgets.QDialog): self.setLayout(mongo_layout) def _mongo_changed(self, mongo: str): - self._mongo_url = mongo + self.parent()._mongo_url = mongo def get_mongo_url(self): - return self._mongo_url + return self.parent()._mongo_url def set_valid(self): self._mongo_input.setStyleSheet( diff --git a/pype.py b/pype.py index 71cd48d15f..954249b2b2 100644 --- a/pype.py +++ b/pype.py @@ -74,10 +74,10 @@ def boot(): ____________ /\ ___ \ \ \ \/_\ \ - \ \ _____/ ______ ___ ___ ___ - \ \ \___/ /\ \ \ \\ \\ \ - \ \____\ \ \_____\ \__\\__\\__\ - \/____/ \/_____/ . PYPE Club . + \ \ _____/ ___ ___ ___ + \ \ \___/ ---- \ \\ \\ \ + \ \____\ / \____\ \__\\__\\__\ + \/____/ \/____/ . PYPE Club . """ diff --git a/pype/lib/user_settings.py b/pype/lib/user_settings.py index 216ebf0d77..e2d1bded8e 100644 --- a/pype/lib/user_settings.py +++ b/pype/lib/user_settings.py @@ -8,6 +8,7 @@ import json from typing import Any from functools import lru_cache from pathlib import Path +import platform import appdirs import keyring @@ -29,6 +30,12 @@ class ASettingRegistry(ABC): def __init__(self, name: str): super(ASettingRegistry, self).__init__() + + # hack for cx_freeze and Windows keyring backend + if platform.system() == "Windows": + from keyring.backends import Windows + keyring.set_keyring(Windows.WinVaultKeyring()) + self._name = name self._items = {} diff --git a/requirements.txt b/requirements.txt index 0044a655dc..18b63041d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ Click clique==1.5.0 coverage cx_Freeze -ftrack-python-api +ftrack-python-api==2.0.0 ffmpeg-python google-api-python-client jsonschema @@ -15,7 +15,7 @@ log4mongo OpenTimelineIO pathlib2 Pillow -pyinput +pynput pymongo pytest pytest-cov diff --git a/setup.py b/setup.py index 76bb6a4aba..5e32a1afe1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,8 @@ install_requires = [ "PIL", "pymongo", "Qt", - "speedcopy" + "speedcopy", + "win32ctypes" ] base = None