From bdf1f8d785c3f5afbef5cc9be7facaf6a399a44a Mon Sep 17 00:00:00 2001 From: tretrauit Date: Tue, 6 Feb 2024 12:04:53 +0700 Subject: [PATCH] fix: use packaging.version instead of distutils distutils is dead --- poetry.lock | 2 +- pyproject.toml | 1 + vollerei/hsr/patcher.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index d4f80e8..2fa7e23 100644 --- a/poetry.lock +++ b/poetry.lock @@ -571,4 +571,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "20ec55c42e3ed67b4e3ae1a3da83a89b7e9ac1fd7d2c50c82959b1b951149611" +content-hash = "c2407ab07d5b45a15d2081a4b930574da4b55e04503e07e2cfa38f5cdbdb68e4" diff --git a/pyproject.toml b/pyproject.toml index 041aa84..7ec46da 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ python = "^3.11" platformdirs = "^3.5.1" requests = "^2.31.0" cleo = "^2.1.0" +packaging = "^23.2" [tool.poetry.group.dev.dependencies] pytest = "^7.3.1" diff --git a/vollerei/hsr/patcher.py b/vollerei/hsr/patcher.py index 5a15635..952ed48 100644 --- a/vollerei/hsr/patcher.py +++ b/vollerei/hsr/patcher.py @@ -1,6 +1,6 @@ from enum import Enum from shutil import copy2, rmtree -from distutils.version import StrictVersion +from packaging import version from vollerei.abc.patcher import PatcherABC from vollerei.common import telemetry from vollerei.exceptions.game import GameNotInstalledError @@ -66,7 +66,7 @@ class Patcher(PatcherABC): with open(self._jadeite.joinpath("version"), "r") as f: current_version = f.read() if current_version: - if StrictVersion(file_version) <= StrictVersion(current_version): + if version.parse(file_version) <= version.parse(current_version): return download_and_extract(file, self._jadeite) with open(self._jadeite.joinpath("version"), "w") as f: