diff options
Diffstat (limited to '')
| -rw-r--r-- | webmentions_ssg/migrations/README (renamed from migrations/README) | 0 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/alembic.ini (renamed from migrations/alembic.ini) | 0 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/env.py (renamed from migrations/env.py) | 14 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/script.py.mako (renamed from migrations/script.py.mako) | 0 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/versions/681a2a9a1bc0_webmention_sender.py (renamed from migrations/versions/681a2a9a1bc0_webmention_sender.py) | 0 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py (renamed from migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py) | 0 | ||||
| -rw-r--r-- | webmentions_ssg/migrations/versions/f63641044cc1_initial_database_schema.py (renamed from migrations/versions/f63641044cc1_initial_database_schema.py) | 0 |
7 files changed, 4 insertions, 10 deletions
diff --git a/migrations/README b/webmentions_ssg/migrations/README index 0e04844..0e04844 100644 --- a/migrations/README +++ b/webmentions_ssg/migrations/README diff --git a/migrations/alembic.ini b/webmentions_ssg/migrations/alembic.ini index bdfa231..bdfa231 100644 --- a/migrations/alembic.ini +++ b/webmentions_ssg/migrations/alembic.ini diff --git a/migrations/env.py b/webmentions_ssg/migrations/env.py index fa912c3..e2e0ec9 100644 --- a/migrations/env.py +++ b/webmentions_ssg/migrations/env.py @@ -3,7 +3,6 @@ # SPDX-License-Identifier: BSD-3-Clause import logging -from logging.config import fileConfig from alembic import context from flask import current_app @@ -12,19 +11,14 @@ from flask import current_app # access to the values within the .ini file in use. config = context.config -# Interpret the config file for Python logging. -# This line sets up loggers basically. -fileConfig(config.config_file_name) +# Flask already configures application logging. +# Do not let Alembic replace existing logging handlers, +# including pytest's log capture handler. logger = logging.getLogger("alembic.env") def get_engine(): - try: - # this works with Flask-SQLAlchemy<3 and Alchemical - return current_app.extensions["migrate"].db.get_engine() - except TypeError, AttributeError: - # this works with Flask-SQLAlchemy>=3 - return current_app.extensions["migrate"].db.engine + return current_app.extensions["migrate"].db.engine def get_engine_url(): diff --git a/migrations/script.py.mako b/webmentions_ssg/migrations/script.py.mako index 2c01563..2c01563 100644 --- a/migrations/script.py.mako +++ b/webmentions_ssg/migrations/script.py.mako diff --git a/migrations/versions/681a2a9a1bc0_webmention_sender.py b/webmentions_ssg/migrations/versions/681a2a9a1bc0_webmention_sender.py index 23bf2dd..23bf2dd 100644 --- a/migrations/versions/681a2a9a1bc0_webmention_sender.py +++ b/webmentions_ssg/migrations/versions/681a2a9a1bc0_webmention_sender.py diff --git a/migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py b/webmentions_ssg/migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py index 4bb7a7c..4bb7a7c 100644 --- a/migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py +++ b/webmentions_ssg/migrations/versions/be6e229d6a3d_do_not_limit_username_and_password_hash_.py diff --git a/migrations/versions/f63641044cc1_initial_database_schema.py b/webmentions_ssg/migrations/versions/f63641044cc1_initial_database_schema.py index 5017bc3..5017bc3 100644 --- a/migrations/versions/f63641044cc1_initial_database_schema.py +++ b/webmentions_ssg/migrations/versions/f63641044cc1_initial_database_schema.py |
