From 9d1d78e8e4fa6212723b2b1364efb23205733a21 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:50:01 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.7.4 → v0.8.1](https://github.com/astral-sh/ruff-pre-commit/compare/v0.7.4...v0.8.1) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 64b0940..1edd1d5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ fail_fast: false repos: - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: 'v0.7.4' + rev: 'v0.8.1' hooks: - id: ruff - repo: https://github.com/pre-commit/pre-commit-hooks From ac7ffe4057b493dca23f81c83737771711f0162c Mon Sep 17 00:00:00 2001 From: pkhalaj <11797985+pkhalaj@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:51:30 +0100 Subject: [PATCH 2/4] Update `errors.py` to make Ruff happy This includes replacing `from sys import exit` with `import sys` and then using `sys.exit()` instead. Ruff complains about `exit` shadowing a built-in. --- trolldb/errors/errors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trolldb/errors/errors.py b/trolldb/errors/errors.py index 6142ab4..2dee664 100644 --- a/trolldb/errors/errors.py +++ b/trolldb/errors/errors.py @@ -5,7 +5,7 @@ """ from collections import OrderedDict -from sys import exit +import sys from typing import ClassVar, NoReturn, Self from fastapi import Response @@ -226,7 +226,7 @@ def sys_exit_log( """ _, msg = self.get_error_details(extra_information, status_code) logger.error(msg) - exit(exit_code) + sys.exit(exit_code) @property def fastapi_descriptor(self) -> dict[StatusCode, dict[str, str]]: From 2ac10c8cfb4aa76cdd9cd15fda5e737361e02e49 Mon Sep 17 00:00:00 2001 From: pkhalaj <11797985+pkhalaj@users.noreply.github.com> Date: Thu, 5 Dec 2024 13:55:17 +0100 Subject: [PATCH 3/4] Sort imports in `errors.py` --- trolldb/errors/errors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trolldb/errors/errors.py b/trolldb/errors/errors.py index 2dee664..a14b774 100644 --- a/trolldb/errors/errors.py +++ b/trolldb/errors/errors.py @@ -4,8 +4,8 @@ specifically. See :obj:`trolldb.database.errors` as an example on how to achieve this. """ -from collections import OrderedDict import sys +from collections import OrderedDict from typing import ClassVar, NoReturn, Self from fastapi import Response From 13f1b35cc6f23c9b63873834effcdb4f251ebcd6 Mon Sep 17 00:00:00 2001 From: pkhalaj <11797985+pkhalaj@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:13:17 +0100 Subject: [PATCH 4/4] Change `AnyUrl` to `MongoDsn` in `test_mongodb.py` to make Pydantic happy `AnyUrl` is not a valid `MongoDsn` anymore! --- trolldb/tests/tests_database/test_mongodb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trolldb/tests/tests_database/test_mongodb.py b/trolldb/tests/tests_database/test_mongodb.py index d077a2e..d9473c1 100644 --- a/trolldb/tests/tests_database/test_mongodb.py +++ b/trolldb/tests/tests_database/test_mongodb.py @@ -12,7 +12,7 @@ import pytest from bson import ObjectId -from pydantic import AnyUrl, ValidationError +from pydantic import MongoDsn, ValidationError from trolldb.database.errors import Client, Collections, Databases from trolldb.database.mongodb import DatabaseConfig, MongoDB, get_id, get_ids, mongodb_context @@ -23,7 +23,7 @@ async def test_connection_timeout_negative(check_log): """Tests that the connection attempt times out after the expected time, since the MongoDB URL is invalid.""" invalid_config = DatabaseConfig( - url=AnyUrl("mongodb://invalid_url_that_does_not_exist:8000"), + url=MongoDsn("mongodb://invalid_url_that_does_not_exist:8000"), timeout=3, main_database_name=test_app_config.database.main_database_name, main_collection_name=test_app_config.database.main_collection_name,