This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 46c57130c6 Erd generating doc improvement (#37808)
46c57130c6 is described below
commit 46c57130c6048dd4598b7709810076627481b056
Author: Wei Lee <[email protected]>
AuthorDate: Fri Mar 1 16:50:56 2024 +0800
Erd generating doc improvement (#37808)
* docs(airflow): fix outdated er digagram generating script path
* docs(scripts): improve run_migration_reference script message
---
docs/apache-airflow/database-erd-ref.rst | 2 +-
scripts/in_container/run_migration_reference.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/apache-airflow/database-erd-ref.rst
b/docs/apache-airflow/database-erd-ref.rst
index dc7d9844c6..a4ebd59e79 100644
--- a/docs/apache-airflow/database-erd-ref.rst
+++ b/docs/apache-airflow/database-erd-ref.rst
@@ -33,6 +33,6 @@ Here is the current Database schema diagram.
`db command <cli-and-env-variables-ref.html#db>`_ for the commands that you
can use to manage
the migrations.
-.. This image is automatically generated by pre-commit via
``scripts/ci/pre_commit/pre_commit_update_diagram.py``
+.. This image is automatically generated by pre-commit via
``scripts/ci/pre_commit/pre_commit_update_er_diagram.py``
.. image:: img/airflow_erd.svg
diff --git a/scripts/in_container/run_migration_reference.py
b/scripts/in_container/run_migration_reference.py
index f5413aa482..83436cb205 100755
--- a/scripts/in_container/run_migration_reference.py
+++ b/scripts/in_container/run_migration_reference.py
@@ -174,9 +174,9 @@ def ensure_filenames_are_sorted(revisions):
"alembic merge -m 'merge heads " + ", ".join(head_prefixes) + "' "
+ " ".join(unmerged_heads)
)
raise SystemExit(
- "You have multiple alembic heads; please merge them with the
`alembic merge` command "
- f"and re-run pre-commit. It should fail once more before
succeeding. "
- f"\nhint: `{alembic_command}`"
+ "You have multiple alembic heads; please merge them with by
running `alembic merge` command under "
+ f'"airflow" directory (where alembic.ini located) and re-run
pre-commit. '
+ f"It should fail once more before succeeding.\nhint:
`{alembic_command}`"
)
for old, new in renames:
os.rename(old, new)
