From 923aa1b90de133b235fc7069d8375edf2ff1300a Mon Sep 17 00:00:00 2001 From: lennard <44114474+Dummerle@users.noreply.github.com> Date: Wed, 26 Oct 2022 21:36:16 +0200 Subject: [PATCH] Migrate to legendary 0.20.30 --- pyproject.toml | 2 +- rare/components/dialogs/login/import_login.py | 2 +- rare/components/tabs/games/game_info/move_game.py | 2 +- rare/components/tabs/settings/widgets/eos.py | 2 +- rare/lgndr/cli.py | 2 +- rare/utils/config_helper.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index c51d653e..4013b25e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,7 +30,7 @@ pywebview = [ { version = "^3.6.3", extras = ["cef"], platform = "windows", optional = true }, { version = "^3.6.3", extras = ["gtk"], platform = "linux", optional = true }, ] -legendary-gl = "^0.20.29" +legendary-gl = "^0.20.30" typing-extensions = "^4.3.0" [tool.poetry.scripts] diff --git a/rare/components/dialogs/login/import_login.py b/rare/components/dialogs/login/import_login.py index a84ce2ad..5a3bcc17 100644 --- a/rare/components/dialogs/login/import_login.py +++ b/rare/components/dialogs/login/import_login.py @@ -5,7 +5,7 @@ from logging import getLogger from PyQt5.QtCore import pyqtSignal from PyQt5.QtWidgets import QFrame, QFileDialog from legendary.core import LegendaryCore -from legendary.utils.wine_helpers import read_registry, get_shell_folders +from legendary.lfs.wine_helpers import get_shell_folders, read_registry from rare.ui.components.dialogs.login.import_login import Ui_ImportLogin diff --git a/rare/components/tabs/games/game_info/move_game.py b/rare/components/tabs/games/game_info/move_game.py index 8b40d5a4..dc4f930b 100644 --- a/rare/components/tabs/games/game_info/move_game.py +++ b/rare/components/tabs/games/game_info/move_game.py @@ -7,7 +7,7 @@ from typing import Tuple from PyQt5.QtCore import pyqtSignal, QRunnable, QObject, Qt from PyQt5.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QLabel, QFileDialog from legendary.models.game import VerifyResult, InstalledGame -from legendary.utils.lfs import validate_files +from legendary.lfs.utils import validate_files from rare.shared import LegendaryCoreSingleton from rare.utils.extra_widgets import PathEdit diff --git a/rare/components/tabs/settings/widgets/eos.py b/rare/components/tabs/settings/widgets/eos.py index db14cc23..45a5b96a 100644 --- a/rare/components/tabs/settings/widgets/eos.py +++ b/rare/components/tabs/settings/widgets/eos.py @@ -6,7 +6,7 @@ from typing import List from PyQt5.QtCore import QRunnable, QObject, pyqtSignal, QThreadPool from PyQt5.QtWidgets import QGroupBox, QMessageBox -from legendary.utils import eos +from legendary.lfs import eos from rare.shared import LegendaryCoreSingleton, GlobalSignalsSingleton from rare.ui.components.tabs.settings.widgets.eos_widget import Ui_EosWidget from rare.models.install import InstallOptionsModel diff --git a/rare/lgndr/cli.py b/rare/lgndr/cli.py index a51e0bd4..1baa1094 100644 --- a/rare/lgndr/cli.py +++ b/rare/lgndr/cli.py @@ -8,7 +8,7 @@ from typing import Optional, Union, Tuple from legendary.cli import LegendaryCLI as LegendaryCLIReal from legendary.models.downloading import AnalysisResult, ConditionCheckResult from legendary.models.game import Game, InstalledGame, VerifyResult -from legendary.utils.lfs import validate_files +from legendary.lfs.utils import validate_files from legendary.utils.selective_dl import get_sdl_appname from .api_arguments import ( diff --git a/rare/utils/config_helper.py b/rare/utils/config_helper.py index 923b813b..7fc78372 100644 --- a/rare/utils/config_helper.py +++ b/rare/utils/config_helper.py @@ -1,7 +1,7 @@ from typing import Callable, Optional from legendary.core import LegendaryCore -from legendary.utils.config import LGDConf +from legendary.lfs.lgndry import LGDConf _config: Optional[LGDConf] = None _save_config: Optional[Callable[[], None]] = None diff --git a/requirements.txt b/requirements.txt index e6ce42d2..daf07712 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ requests PyQt5 QtAwesome setuptools -legendary-gl +legendary-gl==0.20.30 pywin32; platform_system == "Windows" diff --git a/setup.py b/setup.py index 69c489a8..9ab6f0c0 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with open("README.md", "r") as fh: requirements = [ "requests<3.0", - "legendary-gl", + "legendary-gl==0.20.30", "setuptools", "wheel", "PyQt5",