From 3df058ef8dfc9d3eb42240599f65fbc5d7f90d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dni=20=E2=9A=A1?= Date: Mon, 3 Oct 2022 23:41:04 +0200 Subject: [PATCH] formatting and conftest --- lnbits/server.py | 2 +- lnbits/settings.py | 2 ++ tests/conftest.py | 2 +- tools/conv.py | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lnbits/server.py b/lnbits/server.py index 4cb708704..79af8112f 100644 --- a/lnbits/server.py +++ b/lnbits/server.py @@ -12,7 +12,7 @@ import time import click import uvicorn -from lnbits.settings import settings, set_cli_settings +from lnbits.settings import set_cli_settings, settings @click.command( diff --git a/lnbits/settings.py b/lnbits/settings.py index 858420342..a0b1fa688 100644 --- a/lnbits/settings.py +++ b/lnbits/settings.py @@ -151,10 +151,12 @@ if not settings.lnbits_admin_ui: for key, value in settings.dict(exclude_none=True).items(): logger.debug(f"{key}: {value}") + def set_cli_settings(**kwargs): for key, value in kwargs.items(): setattr(settings, key, value) + async def check_admin_settings(): if settings.lnbits_admin_ui: try: diff --git a/tests/conftest.py b/tests/conftest.py index 37c691f35..46282f0c2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -28,7 +28,7 @@ def app(event_loop): # use redefined version of the event loop for scope="session" # loop = asyncio.get_event_loop() loop = event_loop - #loop.run_until_complete(migrate_databases()) + loop.run_until_complete(migrate_databases()) yield app # # get the current event loop and gracefully stop any running tasks # loop = event_loop diff --git a/tools/conv.py b/tools/conv.py index 9d8886a01..254d1ae3f 100644 --- a/tools/conv.py +++ b/tools/conv.py @@ -4,6 +4,7 @@ import sqlite3 from typing import List import psycopg2 + from lnbits.settings import settings # Python script to migrate an LNbits SQLite DB to Postgres