From d5ac5cd4279c4432c8823621a60b602f034ccf46 Mon Sep 17 00:00:00 2001 From: Yoshihiro OKUMURA Date: Wed, 23 Oct 2024 18:33:12 +0900 Subject: [PATCH] fixed compatibility with python 3.10. --- mdrsclient/commands/download.py | 13 +++++++++---- pyproject.toml | 9 +++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/mdrsclient/commands/download.py b/mdrsclient/commands/download.py index c17bf71..9ca0e29 100644 --- a/mdrsclient/commands/download.py +++ b/mdrsclient/commands/download.py @@ -59,8 +59,13 @@ class DownloadCommand(BaseCommand): @classmethod def download( - cls, remote_path: str, local_path: str, is_recursive: bool, is_skip_if_exists: bool, password: str | None, - excludes: list[str] + cls, + remote_path: str, + local_path: str, + is_recursive: bool, + is_skip_if_exists: bool, + password: str | None, + excludes: list[str], ) -> None: (remote, laboratory_name, r_path) = cls._parse_remote_host_with_path(remote_path) r_path = r_path.rstrip("/") @@ -100,7 +105,7 @@ class DownloadCommand(BaseCommand): folder_id: str, basedir: str, excludes: list[str], - is_skip_if_exists: bool + is_skip_if_exists: bool, ) -> None: context = DownloadContext(False, is_skip_if_exists, []) folder = folder_api.retrieve(folder_id) @@ -146,5 +151,5 @@ class DownloadCommand(BaseCommand): @classmethod def __check_excludes(cls, excludes: list[str], laboratory: Laboratory, folder: Folder, file: File | None) -> bool: - path = f"/{laboratory.name}{folder.path}{file.name if file is not None else ""}".rstrip("/").lower() + path = f"/{laboratory.name}{folder.path}{file.name if file is not None else ''}".rstrip("/").lower() return path in excludes diff --git a/pyproject.toml b/pyproject.toml index 8d0569f..04ee151 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "mdrs-client-python" -version = "1.3.8" +version = "1.3.9" description = "The mdrs-client-python is python library and a command-line client for up- and downloading files to and from MDRS based repository." authors = ["Yoshihiro OKUMURA "] license = "MIT" @@ -13,6 +13,7 @@ classifiers=[ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "OSI Approved :: MIT License", "Topic :: Utilities", ] @@ -26,16 +27,16 @@ requests = "^2.32.3" requests-toolbelt = "^1.0.0" python-dotenv = "^1.0.1" pydantic = "^2.9.2" -pydantic-settings = "^2.5.2" +pydantic-settings = "^2.6.0" PyJWT = "^2.9.0" validators = "^0.33.0" [tool.poetry.group.dev.dependencies] -black = "^24.8.0" +black = "^24.10.0" flake8 = "^7.1.1" Flake8-pyproject = "^1.2.3" isort = "^5.13.2" -pyright = "^1.1.380" +pyright = "^1.1.386" [tool.poetry.scripts] mdrs = 'mdrsclient.__main__:main'