dds-cli 2.14.0__tar.gz → 2.14.2__tar.gz

{dds_cli-2.14.0 → dds_cli-2.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.14.0
+Version: 2.14.2
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
@@ -16,18 +16,17 @@ License-File: LICENSE
 Requires-Dist: boto3==1.24.73
 Requires-Dist: botocore==1.27.73
 Requires-Dist: click==8.1.3
-Requires-Dist: click-pathlib==2020.3.13.0
-Requires-Dist: cryptography==44.0.1
+Requires-Dist: cryptography==46.0.6
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: prettytable==3.7.0
 Requires-Dist: prompt-toolkit==3.0.40
 Requires-Dist: PyNaCl==1.6.2
-Requires-Dist: pytz==2022.2.1
+Requires-Dist: pytz==2026.1.post1
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: questionary==2.1.1
-Requires-Dist: requests==2.32.4
-Requires-Dist: rich==13.6.0
+Requires-Dist: requests==2.33.0
+Requires-Dist: rich==14.3.3
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
@@ -60,15 +59,15 @@ Dynamic: summary
 <a href="https://opensource.org/licenses/MIT">
     <img alt="Licence: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg">
 </a>
-<a href="https://github.com/psf/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
+<a href="https://github.com/astral-sh/ruff">
+    <img alt="Linting: ruff" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
 </a>
 <a href="https://prettier.io/">
     <img alt="Code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg">
 </a>
 <br />
-<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml">
+    <img alt="Linting: ruff" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
 <a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" > 

{dds_cli-2.14.0 → dds_cli-2.14.2}/README.md

@@ -15,15 +15,15 @@
 <a href="https://opensource.org/licenses/MIT">
     <img alt="Licence: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg">
 </a>
-<a href="https://github.com/psf/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
+<a href="https://github.com/astral-sh/ruff">
+    <img alt="Linting: ruff" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
 </a>
 <a href="https://prettier.io/">
     <img alt="Code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg">
 </a>
 <br />
-<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml">
+    <img alt="Linting: ruff" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
 <a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" > 

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/__init__.py

@@ -1,4 +1,4 @@
-# pylint: skip-file
+# ruff: noqa
 """DDS CLI."""
 
 import datetime

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/__main__.py

@@ -13,7 +13,6 @@ import sys
 
 # Installed
 
-import click_pathlib
 import questionary
 import rich
 import rich.logging
@@ -200,12 +199,11 @@ def dds_main(click_ctx, verbose, force_no_log, log_file, no_prompt, token_path):
             else:
                 file_handler = dds_cli.utils.setup_logging_to_file(filename=log_file)
                 LOG.addHandler(file_handler)
-        else:
-            if force_no_log:
-                LOG.warning(
-                    "You have chosen to turn off the recommended default logging with the '--force-no-log' option."
-                )
-                click_ctx.obj.update({"DEFAULT_LOG": False})
+        elif force_no_log:
+            LOG.warning(
+                "You have chosen to turn off the recommended default logging with the '--force-no-log' option."
+            )
+            click_ctx.obj.update({"DEFAULT_LOG": False})
 
 
 # ************************************************************************************************ #
@@ -269,29 +267,27 @@ def list_projects_and_contents(
                 projects = lister.list_projects(sort_by=sort, show_all=show_all)
                 if json:
                     dds_cli.utils.console.print_json(data=projects)
-                else:
-                    # If an interactive terminal, ask user if they want to view files for a project
-                    if sys.stdout.isatty() and not lister.no_prompt:
-                        project_ids = [p["Project ID"] for p in projects]
-                        LOG.info(
-                            "Would you like to view files in a specific project? "
-                            "Leave blank to exit."
-                        )
-                        # Keep asking until we get a valid response
-                        while project not in project_ids:
-                            try:
-                                project = questionary.autocomplete(
-                                    "Project ID:",
-                                    choices=project_ids,
-                                    validate=lambda x: x in project_ids or x == "",
-                                    style=dds_cli.dds_questionary_styles,
-                                ).unsafe_ask()
-                                assert project and project != ""
-
-                            # If didn't enter anything, convert to None and exit
-                            except (KeyboardInterrupt, AssertionError):
-                                LOG.debug("No project entered, exiting.")
-                                break
+                # If an interactive terminal, ask user if they want to view files for a project
+                elif sys.stdout.isatty() and not lister.no_prompt:
+                    project_ids = [p["Project ID"] for p in projects]
+                    LOG.info(
+                        "Would you like to view files in a specific project? Leave blank to exit."
+                    )
+                    # Keep asking until we get a valid response
+                    while project not in project_ids:
+                        try:
+                            project = questionary.autocomplete(
+                                "Project ID:",
+                                choices=project_ids,
+                                validate=lambda x: x in project_ids or x == "",
+                                style=dds_cli.dds_questionary_styles,
+                            ).unsafe_ask()
+                            assert project and project != ""
+
+                        # If didn't enter anything, convert to None and exit
+                        except (KeyboardInterrupt, AssertionError):
+                            LOG.debug("No project entered, exiting.")
+                            break
 
         # List all files in a project if we know a project ID
         if project:
@@ -783,15 +779,14 @@ def delete_user(click_ctx, email, self, is_invite):
             proceed_deletion = rich.prompt.Confirm.ask(
                 f"Delete invitation of {email} to Data Delivery System?"
             )
+        elif self:
+            proceed_deletion = rich.prompt.Confirm.ask(
+                "Are you sure? Deleted accounts can't be restored!"
+            )
         else:
-            if self:
-                proceed_deletion = rich.prompt.Confirm.ask(
-                    "Are you sure? Deleted accounts can't be restored!"
-                )
-            else:
-                proceed_deletion = rich.prompt.Confirm.ask(
-                    f"Delete Data Delivery System user account associated with {email}"
-                )
+            proceed_deletion = rich.prompt.Confirm.ask(
+                f"Delete Data Delivery System user account associated with {email}"
+            )
 
     if proceed_deletion:
         try:
@@ -1630,7 +1625,9 @@ def data_group_command(_):
     "--mount-dir",
     "-md",
     required=False,
-    type=click_pathlib.Path(exists=False, file_okay=False, dir_okay=True, resolve_path=True),
+    type=click.Path(
+        exists=False, file_okay=False, dir_okay=True, resolve_path=True, path_type=pathlib.Path
+    ),
     help=(
         "New directory where the files will be mounted before upload "
         "and any error log files will be saved for a specific upload."
@@ -1753,7 +1750,9 @@ def put_data(
 @source_path_file_option()
 @destination_option(
     help_message="Destination of downloaded data.",
-    option_type=click_pathlib.Path(exists=False, file_okay=False, dir_okay=True, resolve_path=True),
+    option_type=click.Path(
+        exists=False, file_okay=False, dir_okay=True, resolve_path=True, path_type=pathlib.Path
+    ),
 )
 # Flags
 @break_on_fail_flag(help_message="Cancel download of all files if one fails.")
@@ -2020,12 +2019,11 @@ def rm_data(click_ctx, project, file, folder, rm_all):
     if rm_all:
         if no_prompt:
             LOG.warning("Deleting all files within project '%s'", project)
-        else:
-            if not rich.prompt.Confirm.ask(
-                f"Are you sure you want to delete all files within project '{project}'?"
-            ):
-                LOG.info("Probably for the best. Exiting.")
-                sys.exit(0)
+        elif not rich.prompt.Confirm.ask(
+            f"Are you sure you want to delete all files within project '{project}'?"
+        ):
+            LOG.info("Probably for the best. Exiting.")
+            sys.exit(0)
 
     try:
         with dds_cli.data_remover.DataRemover(

dds_cli-2.14.2/dds_cli/constants.py

@@ -0,0 +1,25 @@
+"""Shared constants used in the DDS CLI.
+
+Using this will avoid e.g. circular imports and
+make it easier to maintain.
+
+TODO: Move other constants here from __init__.py.
+"""
+
+# Timeout settings for upload and download
+READ_TIMEOUT = 300
+CONNECT_TIMEOUT = 60
+
+# Retry settings for download
+DOWNLOAD_MAX_RETRIES = 5
+DOWNLOAD_BACKOFF_FACTOR = 2
+DOWNLOAD_INITIAL_WAIT = 1  # seconds
+
+# Import these constants when using '*'
+__all__ = [
+    "READ_TIMEOUT",
+    "CONNECT_TIMEOUT",
+    "DOWNLOAD_MAX_RETRIES",
+    "DOWNLOAD_BACKOFF_FACTOR",
+    "DOWNLOAD_INITIAL_WAIT",
+]

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/custom_decorators.py

@@ -154,7 +154,6 @@ def removal_spinner(func):
             SpinnerColumn(spinner_name="dots12", style="white"),
             console=dds_cli.utils.stderr_console,
         ) as progress:
-
             description: str | None = None  # type hint, initialized
             # Determine spinner text
             if func.__name__ == "remove_all":

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/data_getter.py

@@ -7,6 +7,7 @@
 # Standard library
 import logging
 import pathlib
+import time
 
 # Installed
 import requests
@@ -243,35 +244,68 @@ class DataGetter(base.DDSBaseClass):
         error = ""
         file_local = self.filehandler.data[file]["path_downloaded"]
         file_remote = self.filehandler.data[file]["url"]
+        file_name_in_db = escape(str(self.filehandler.data[file]["name_in_db"]))
 
-        try:
-            with requests.get(
-                file_remote,
-                stream=True,
-                timeout=(constants.CONNECT_TIMEOUT, constants.READ_TIMEOUT),
-            ) as req:
-                req.raise_for_status()
-                with file_local.open(mode="wb") as new_file:
-                    for chunk in req.iter_content(chunk_size=FileSegment.SEGMENT_SIZE_CIPHER):
-                        progress.update(task, advance=len(chunk))
-                        new_file.write(chunk)
-        except (
+        retryable_exceptions = (
             requests.exceptions.ConnectTimeout,
-            requests.exceptions.HTTPError,
             requests.exceptions.ReadTimeout,
             requests.exceptions.Timeout,
             requests.exceptions.ConnectionError,
-        ) as err:
-            if (
-                hasattr(err, "response")
-                and hasattr(err.response, "status_code")
-                and err.response.status_code == 404
-            ):
-                error = "File not found! Please contact support."
-            else:
+        )
+
+        max_retries = constants.DOWNLOAD_MAX_RETRIES
+        backoff_factor = constants.DOWNLOAD_BACKOFF_FACTOR
+        wait = constants.DOWNLOAD_INITIAL_WAIT
+        retry_messages = []
+
+        for attempt in range(1, max_retries + 1):
+            error = ""
+            if attempt > 1:
+                progress.reset(task, completed=0)
+
+            try:
+                with requests.get(
+                    file_remote,
+                    stream=True,
+                    timeout=(constants.CONNECT_TIMEOUT, constants.READ_TIMEOUT),
+                ) as req:
+                    req.raise_for_status()
+                    with file_local.open(mode="wb") as new_file:
+                        for chunk in req.iter_content(chunk_size=FileSegment.SEGMENT_SIZE_CIPHER):
+                            progress.update(task, advance=len(chunk))
+                            new_file.write(chunk)
+            except (requests.exceptions.HTTPError, *retryable_exceptions) as err:
+                if (
+                    isinstance(err, requests.exceptions.HTTPError)
+                    and hasattr(err, "response")
+                    and hasattr(err.response, "status_code")
+                    and err.response.status_code == 404
+                ):
+                    error = "File not found! Please contact support."
+                    break
                 error = str(err)
-        else:
-            downloaded = True
+                if attempt < max_retries:
+                    retry_msg = (
+                        f"Download attempt {attempt}/{max_retries} failed for "
+                        f"'{file_name_in_db}': {error}. Retrying in {wait}s..."
+                    )
+                    retry_messages.append(retry_msg)
+                    LOG.warning(retry_msg)
+                    time.sleep(wait)
+                    wait *= backoff_factor
+            else:
+                downloaded = True
+                break
+
+        if not downloaded and error:
+            if retry_messages:
+                error = " | ".join(retry_messages) + f" | Final error: {error}"
+            LOG.error(
+                "Download failed for '%s' after %d attempts: %s",
+                file_name_in_db,
+                max_retries,
+                error,
+            )
 
         return downloaded, error
 

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/data_lister.py

@@ -233,7 +233,7 @@ class DataLister(base.DDSBaseClass):
                 error_message="Failed to list the project's directory tree",
             )
 
-            if not "files_folders" in resp_json:
+            if "files_folders" not in resp_json:
                 raise exceptions.NoDataError(f"Could not find folder: '{folder}'")
 
             sorted_files_folders = sorted(resp_json["files_folders"], key=lambda f: f["name"])

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/data_putter.py

@@ -68,7 +68,6 @@ def put(
         destination=destination,
         staging_dir=staging_dir,
     ) as putter:
-
         # Progress object to keep track of progress tasks
         with Progress(
             "{task.description}",

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/file_compressor.py

@@ -1,4 +1,4 @@
-""""Compressor module. Handles the compression of files."""
+"""Compressor module. Handles the compression of files."""
 
 ###############################################################################
 # IMPORTS ########################################################### IMPORTS #
@@ -10,7 +10,6 @@ import logging
 import pathlib
 import traceback
 
-
 # Installed
 import zstandard as zstd
 from rich.markup import escape
@@ -36,7 +35,7 @@ class CompressionMagic:
     LZIP = b"LZIP"
     RAR4 = b"Rar!\x1a\x07\x00"
     RAR5 = b"Rar!\x1a\x07\x01\x00"
-    GZIP = b"\x1F\x8B"
+    GZIP = b"\x1f\x8b"
     ZSTANDARD = b"(\xb5/\xfd"
 
 
@@ -55,7 +54,7 @@ class Compressor:
             b"_'\xa8\x89": "jar",
             b"ZOO ": "zoo",
             b"PK\x03\x04": "zip",
-            b"\x1F\x8B": "gzip",
+            b"\x1f\x8b": "gzip",
             b"UFA\xc6\xd2\xc1": "ufa",
             b"StuffIt ": "sit",
             b"Rar!\x1a\x07\x00": "rar v4.x",
@@ -105,7 +104,7 @@ class Compressor:
                     #         break
                     #     yield
                     yield from iter(lambda: compressor.read(chunk_size), b"")
-        except Exception as err:  # pylint: disable=broad-exception-caught
+        except Exception as err:
             LOG.warning(str(err))
         else:
             LOG.debug("Compression of '%s' finished.", file)

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/file_encryptor.py

@@ -274,5 +274,5 @@ class Decryptor(ECDHKeyHandler):
                 )
                 if last_nonce != nonce:
                     raise SystemExit("Nonces do not match!!")
-        except Exception as err:  # pylint: disable=broad-exception-caught
+        except Exception as err:
             LOG.warning(str(err))

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/file_handler_local.py

@@ -83,7 +83,7 @@ class LocalFileHandler(fh.FileHandler):
         called in the bucket."""
 
         # Generate new file name
-        new_name = f"{'%020x' % random.randrange(16**20)}_{uuid.uuid5(uuid.NAMESPACE_X500, str(folder))}{uuid.uuid5(uuid.NAMESPACE_X500, filename)}"  # pylint: disable=line-too-long,consider-using-f-string
+        new_name = f"{'%020x' % random.randrange(16**20)}_{uuid.uuid5(uuid.NAMESPACE_X500, str(folder))}{uuid.uuid5(uuid.NAMESPACE_X500, filename)}"
         return new_name
 
     @staticmethod
@@ -147,26 +147,25 @@ class LocalFileHandler(fh.FileHandler):
                     folder=path_key,
                 )
                 file_info.update({**content_info})
-            else:
-                # Symlinks are also identified as files - if here and symlink --> broken
-                if path.is_symlink():
-                    try:
-                        resolved = path.resolve()
-                    except RuntimeError:
-                        LOG.warning(
-                            "IGNORED: Link: '%s' seems to contain infinite loop, will be ignored.",
-                            path,
-                        )
-                    else:
-                        LOG.warning(
-                            "IGNORED: Link: '%s' -> '%s' seems to be broken, will be ignored.",
-                            path,
-                            resolved,
-                        )
+            # Symlinks are also identified as files - if here and symlink --> broken
+            elif path.is_symlink():
+                try:
+                    resolved = path.resolve()
+                except RuntimeError:
+                    LOG.warning(
+                        "IGNORED: Link: '%s' seems to contain infinite loop, will be ignored.",
+                        path,
+                    )
                 else:
                     LOG.warning(
-                        "IGNORED: Path of unsupported/unknown type: '%s', will be ignored.", path
+                        "IGNORED: Link: '%s' -> '%s' seems to be broken, will be ignored.",
+                        path,
+                        resolved,
                     )
+            else:
+                LOG.warning(
+                    "IGNORED: Path of unsupported/unknown type: '%s', will be ignored.", path
+                )
 
         return file_info, progress_tasks
 

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/file_handler_remote.py

@@ -100,8 +100,7 @@ class RemoteFileHandler(fh.FileHandler):
 
         # Save info on files in dict and return
         data = {
-            self.local_destination
-            / pathlib.Path(x): {
+            self.local_destination / pathlib.Path(x): {
                 **y,
                 "name_in_db": x,
                 "path_downloaded": self.local_destination
@@ -115,8 +114,7 @@ class RemoteFileHandler(fh.FileHandler):
         for _, folder_item in folder_contents.items():
             data.update(
                 {
-                    self.local_destination
-                    / pathlib.Path(j): {
+                    self.local_destination / pathlib.Path(j): {
                         **k,
                         "name_in_db": j,
                         "path_downloaded": self.local_destination

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/project_info.py

@@ -57,7 +57,7 @@ class ProjectInfoManager(base.DDSBaseClass):
         dds_cli.utils.console.print(f"[b]Project title:[/b]       {project_info['Title']}")
         dds_cli.utils.console.print(f"[b]Project description:[/b] {project_info['Description']}")
 
-    def update_info(self, title=None, description=None, pi=None):  # pylint: disable=invalid-name
+    def update_info(self, title=None, description=None, pi=None):
         """Update project info"""
 
         if all(item is None for item in [title, description, pi]):

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/project_status.py

@@ -307,7 +307,7 @@ class ProjectBusyStatusManager(base.DDSBaseClass):
             else:
                 projects: typing.Dict = response_json.get("projects")
                 LOG.info("The following projects are busy:")
-                for proj in projects:
-                    dds_cli.utils.console.print(f"{proj}: updated on {projects[proj]}")
+                for proj, updated_on in projects.items():
+                    dds_cli.utils.console.print(f"{proj}: updated on {updated_on}")
         else:
             LOG.info("There are no busy projects at the moment.")

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/user.py

@@ -275,7 +275,7 @@ class User:
                     )
                     # Get response
                     username = response_json["info"]["username"]
-                except:  # pylint: disable=bare-except
+                except:  # noqa: E722
                     pass
         return username
 
@@ -307,7 +307,7 @@ class TokenFile:
         self.check_token_file_permissions()
 
         # Read token from file
-        with self.token_file.open(mode="r") as file:  # pylint: disable=unspecified-encoding
+        with self.token_file.open(mode="r") as file:  # noqa: PLW1514
             token = file.read()
             if not token:
                 raise exceptions.TokenNotFoundError(message="Token file is empty.")
@@ -331,7 +331,7 @@ class TokenFile:
 
         self.check_token_file_permissions()
 
-        with self.token_file.open("w") as file:  # pylint: disable=unspecified-encoding
+        with self.token_file.open("w") as file:  # noqa: PLW1514
             file.write(token)
 
         if os.name == "nt":
@@ -421,7 +421,7 @@ class TokenFile:
         return expiration_time
 
     # Private methods ############################################################ Private methods #
-    def __token_dates(self, token):  # pylint: disable=inconsistent-return-statements
+    def __token_dates(self, token):  # noqa: PLR1710
         """Returns the expiration time in UTC that is extracted from the token jose header."""
 
         expiration_time = get_token_expiration_time(token=token)

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/utils.py

@@ -49,9 +49,9 @@ class HumanBytes:
         """
         assert isinstance(num, (int, float)), "num must be an int or float"
         assert isinstance(metric, bool), "metric must be a bool"
-        assert (
-            isinstance(precision, int) and 0 <= precision <= 3
-        ), "precision must be an int (range 0-3)"
+        assert isinstance(precision, int) and 0 <= precision <= 3, (
+            "precision must be an int (range 0-3)"
+        )
 
         unit_labels = HumanBytes.METRIC_LABELS if metric else HumanBytes.BINARY_LABELS
         last_label = unit_labels[-1]
@@ -324,9 +324,7 @@ def get_json_response(response):
     return json_response
 
 
-def format_api_response(
-    response, key: str, binary: bool = False, always_show: bool = False
-):  # pylint: disable=unused-argument
+def format_api_response(response, key: str, binary: bool = False, always_show: bool = False):
     """Take a value e.g. bytes and reformat it to include a unit prefix."""
     formatted_response = response
     if isinstance(response, bool):

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli/version.py

@@ -2,4 +2,4 @@
 
 # Do not change bump the major version unless absolutely necessary - makes incompatible with API
 # If mid or minor version reaches 9, continue to 10, 11 etc.
-__version__ = "2.14.0"
+__version__ = "2.14.2"

{dds_cli-2.14.0 → dds_cli-2.14.2}/dds_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.14.0
+Version: 2.14.2
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
@@ -16,18 +16,17 @@ License-File: LICENSE
 Requires-Dist: boto3==1.24.73
 Requires-Dist: botocore==1.27.73
 Requires-Dist: click==8.1.3
-Requires-Dist: click-pathlib==2020.3.13.0
-Requires-Dist: cryptography==44.0.1
+Requires-Dist: cryptography==46.0.6
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: prettytable==3.7.0
 Requires-Dist: prompt-toolkit==3.0.40
 Requires-Dist: PyNaCl==1.6.2
-Requires-Dist: pytz==2022.2.1
+Requires-Dist: pytz==2026.1.post1
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: questionary==2.1.1
-Requires-Dist: requests==2.32.4
-Requires-Dist: rich==13.6.0
+Requires-Dist: requests==2.33.0
+Requires-Dist: rich==14.3.3
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
@@ -60,15 +59,15 @@ Dynamic: summary
 <a href="https://opensource.org/licenses/MIT">
     <img alt="Licence: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg">
 </a>
-<a href="https://github.com/psf/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
+<a href="https://github.com/astral-sh/ruff">
+    <img alt="Linting: ruff" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
 </a>
 <a href="https://prettier.io/">
     <img alt="Code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg">
 </a>
 <br />
-<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml">
+    <img alt="Linting: ruff" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
 <a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" >