From e9b2f9f480b1e8569a706533a8b6ca7f6a53c1b1 Mon Sep 17 00:00:00 2001 From: Patrick Arminio Date: Fri, 5 Apr 2024 21:59:40 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20isort=20configuration,?= =?UTF-8?q?=20since=20we=20use=20Ruff=20now=20(#1144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Sebastián Ramírez --- backend/app/tests/api/routes/test_login.py | 5 +++-- backend/app/tests/api/routes/test_users.py | 8 +++++--- backend/app/tests/scripts/test_backend_pre_start.py | 9 ++++++--- backend/app/tests/scripts/test_test_pre_start.py | 9 ++++++--- backend/pyproject.toml | 5 ----- backend/scripts/format-imports.sh | 6 ------ backend/scripts/format.sh | 5 ++--- backend/scripts/lint.sh | 2 +- 8 files changed, 23 insertions(+), 26 deletions(-) delete mode 100755 backend/scripts/format-imports.sh diff --git a/backend/app/tests/api/routes/test_login.py b/backend/app/tests/api/routes/test_login.py index 9c8e966..eccc11d 100644 --- a/backend/app/tests/api/routes/test_login.py +++ b/backend/app/tests/api/routes/test_login.py @@ -42,8 +42,9 @@ def test_use_access_token( def test_recovery_password( client: TestClient, normal_user_token_headers: dict[str, str] ) -> None: - with patch("app.core.config.settings.SMTP_HOST", "smtp.example.com"), patch( - "app.core.config.settings.SMTP_USER", "admin@example.com" + with ( + patch("app.core.config.settings.SMTP_HOST", "smtp.example.com"), + patch("app.core.config.settings.SMTP_USER", "admin@example.com"), ): email = "test@example.com" r = client.post( diff --git a/backend/app/tests/api/routes/test_users.py b/backend/app/tests/api/routes/test_users.py index f37920b..115e399 100644 --- a/backend/app/tests/api/routes/test_users.py +++ b/backend/app/tests/api/routes/test_users.py @@ -34,9 +34,11 @@ def test_get_users_normal_user_me( def test_create_user_new_email( client: TestClient, superuser_token_headers: dict[str, str], db: Session ) -> None: - with patch("app.utils.send_email", return_value=None), patch( - "app.core.config.settings.SMTP_HOST", "smtp.example.com" - ), patch("app.core.config.settings.SMTP_USER", "admin@example.com"): + with ( + patch("app.utils.send_email", return_value=None), + patch("app.core.config.settings.SMTP_HOST", "smtp.example.com"), + patch("app.core.config.settings.SMTP_USER", "admin@example.com"), + ): username = random_email() password = random_lower_string() data = {"email": username, "password": password} diff --git a/backend/app/tests/scripts/test_backend_pre_start.py b/backend/app/tests/scripts/test_backend_pre_start.py index ccf420e..631690f 100644 --- a/backend/app/tests/scripts/test_backend_pre_start.py +++ b/backend/app/tests/scripts/test_backend_pre_start.py @@ -12,9 +12,12 @@ def test_init_successful_connection() -> None: exec_mock = MagicMock(return_value=True) session_mock.configure_mock(**{"exec.return_value": exec_mock}) - with patch("sqlmodel.Session", return_value=session_mock), patch.object( - logger, "info" - ), patch.object(logger, "error"), patch.object(logger, "warn"): + with ( + patch("sqlmodel.Session", return_value=session_mock), + patch.object(logger, "info"), + patch.object(logger, "error"), + patch.object(logger, "warn"), + ): try: init(engine_mock) connection_successful = True diff --git a/backend/app/tests/scripts/test_test_pre_start.py b/backend/app/tests/scripts/test_test_pre_start.py index b3385e1..a176f38 100644 --- a/backend/app/tests/scripts/test_test_pre_start.py +++ b/backend/app/tests/scripts/test_test_pre_start.py @@ -12,9 +12,12 @@ def test_init_successful_connection() -> None: exec_mock = MagicMock(return_value=True) session_mock.configure_mock(**{"exec.return_value": exec_mock}) - with patch("sqlmodel.Session", return_value=session_mock), patch.object( - logger, "info" - ), patch.object(logger, "error"), patch.object(logger, "warn"): + with ( + patch("sqlmodel.Session", return_value=session_mock), + patch.object(logger, "info"), + patch.object(logger, "error"), + patch.object(logger, "warn"), + ): try: init(engine_mock) connection_successful = True diff --git a/backend/pyproject.toml b/backend/pyproject.toml index c3142f1..2e578c5 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -36,11 +36,6 @@ types-python-jose = "^3.3.4.20240106" types-passlib = "^1.7.7.20240106" coverage = "^7.4.3" -[tool.isort] -multi_line_output = 3 -include_trailing_comma = true -force_grid_wrap = 0 -line_length = 88 [build-system] requires = ["poetry>=0.12"] build-backend = "poetry.masonry.api" diff --git a/backend/scripts/format-imports.sh b/backend/scripts/format-imports.sh deleted file mode 100755 index 68f70ee..0000000 --- a/backend/scripts/format-imports.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e -set -x - -# Sort imports one per line, so autoflake can remove unused imports -isort --recursive --force-single-line-imports --apply app -sh ./scripts/format.sh diff --git a/backend/scripts/format.sh b/backend/scripts/format.sh index 71d9779..7be2f81 100755 --- a/backend/scripts/format.sh +++ b/backend/scripts/format.sh @@ -1,6 +1,5 @@ #!/bin/sh -e set -x -autoflake --remove-all-unused-imports --recursive --remove-unused-variables --in-place app --exclude=__init__.py -black app -isort --recursive --apply app +ruff check app scripts --fix +ruff format app scripts diff --git a/backend/scripts/lint.sh b/backend/scripts/lint.sh index 7b0397e..b3b2b4e 100644 --- a/backend/scripts/lint.sh +++ b/backend/scripts/lint.sh @@ -4,5 +4,5 @@ set -e set -x mypy app -ruff app +ruff check app ruff format app --check