From a34b0668d173800c14c3a52d32e23fef0f449ea6 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Mon, 13 Nov 2023 18:24:23 +0000
Subject: [PATCH] finishing touches
---
gso/__init__.py | 2 +-
test/conftest.py | 5 ++---
tox.ini | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gso/__init__.py b/gso/__init__.py
index bcf939dd..c92a6db2 100644
--- a/gso/__init__.py
+++ b/gso/__init__.py
@@ -25,7 +25,7 @@ def init_worker_app() -> OrchestratorCore:
def init_cli_app() -> typer.Typer:
"""Initialise :term:`GSO` as a CLI application."""
- from gso.cli import import_sites
+ from gso.cli import import_sites # noqa: PLC0415
cli_app.add_typer(import_sites.app, name="import_sites")
cli_app.add_typer(netbox.app, name="netbox-cli")
diff --git a/test/conftest.py b/test/conftest.py
index 0e546594..a9bf269b 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -13,6 +13,7 @@ from alembic import command
from alembic.config import Config
from faker import Faker
from faker.providers import BaseProvider
+from oauth2_lib.settings import oauth2lib_settings
from orchestrator import app_settings
from orchestrator.db import Database, db
from orchestrator.db.database import ENGINE_ARGUMENTS, SESSION_ARGUMENTS, BaseModel
@@ -306,13 +307,11 @@ def _db_session(_database):
@pytest.fixture(scope="session", autouse=True)
-def fastapi_app(database, db_uri):
+def fastapi_app(_database, db_uri):
"""Load the GSO FastAPI app for testing purposes.
This implementation is as close as possible to the one present in orchestrator-core.
"""
- from oauth2_lib.settings import oauth2lib_settings
-
oauth2lib_settings.OAUTH2_ACTIVE = False
oauth2lib_settings.ENVIRONMENT_IGNORE_MUTATION_DISABLED = ["local", "TESTING"]
app_settings.DATABASE_URI = db_uri
diff --git a/tox.ini b/tox.ini
index 40ad7edb..17883b4b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,8 +17,8 @@ deps =
-r requirements.txt
commands =
- ruff .
- ruff format --respect-gitignore --preview --check .
+ ruff --preview .
+ ruff format --respect-gitignore --preview .
mypy .
coverage erase
coverage run --source gso --omit="gso/migrations/*" -m pytest {posargs}
--
GitLab