From 54a496a57f6386927284495e12e5a775572c5e54 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Thu, 30 Sep 2021 14:54:04 +0800 Subject: [PATCH] refactor: Change the path of file alembic.ini Change the path of file alembic.ini to skyline_apiserver/db/alembic. Change-Id: Ic932dd4ed7350217a0db8eb766b863101d54f9af --- libs/skyline-apiserver/Makefile | 6 +++--- libs/skyline-apiserver/pyproject.toml | 1 + .../{ => skyline_apiserver/db/alembic}/alembic.ini | 0 libs/skyline-console | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename libs/skyline-apiserver/{ => skyline_apiserver/db/alembic}/alembic.ini (100%) diff --git a/libs/skyline-apiserver/Makefile b/libs/skyline-apiserver/Makefile index d08202a..768831e 100644 --- a/libs/skyline-apiserver/Makefile +++ b/libs/skyline-apiserver/Makefile @@ -59,17 +59,17 @@ clean: .PHONY: db_revision -HEAD_REV ?= $(shell poetry run alembic heads | awk '{print $$1}') +HEAD_REV ?= $(shell poetry run alembic -c skyline_apiserver/db/alembic/alembic.ini heads | awk '{print $$1}') NEW_REV ?= $(shell python3 -c 'import sys; print(f"{int(sys.argv[1])+1:03}")' $(HEAD_REV)) REV_MEG ?= db_revision: $(shell [ -z "$(REV_MEG)" ] && printf '$(red)Missing required message, use "make db_revision REV_MEG="$(no_color)') - poetry run alembic revision --autogenerate --rev-id $(NEW_REV) -m '$(REV_MEG)' + poetry run alembic -c skyline_apiserver/db/alembic/alembic.ini revision --autogenerate --rev-id $(NEW_REV) -m '$(REV_MEG)' .PHONY: db_sync db_sync: - poetry run alembic upgrade head + poetry run alembic -c skyline_apiserver/db/alembic/alembic.ini upgrade head # Find python files without "type annotations" diff --git a/libs/skyline-apiserver/pyproject.toml b/libs/skyline-apiserver/pyproject.toml index 5df1595..243e13a 100644 --- a/libs/skyline-apiserver/pyproject.toml +++ b/libs/skyline-apiserver/pyproject.toml @@ -4,6 +4,7 @@ version = "0.1.0" description = "" license = "Apache-2.0" authors = ["OpenStack "] +include = ["skyline_apiserver/db/alembic/alembic.ini"] [tool.poetry.dependencies] python = "^3.8" diff --git a/libs/skyline-apiserver/alembic.ini b/libs/skyline-apiserver/skyline_apiserver/db/alembic/alembic.ini similarity index 100% rename from libs/skyline-apiserver/alembic.ini rename to libs/skyline-apiserver/skyline_apiserver/db/alembic/alembic.ini diff --git a/libs/skyline-console b/libs/skyline-console index 1b9c23e..7f273e4 160000 --- a/libs/skyline-console +++ b/libs/skyline-console @@ -1 +1 @@ -Subproject commit 1b9c23e5c286a263a673bfb0489053f296b42401 +Subproject commit 7f273e41c152a3eb1fd95d77cc8ca8442f918783