Updated pre-commit, migrations moved into app

Author: yarikdevcom

.pre-commit-config.yaml

@@ -11,10 +11,6 @@ repos:
     rev: 5.10.1
     hooks:
       - id: isort
-        name: isort (python)
-        args:
-          - '--profile'
-          - black
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:

alembic.ini app/alembic.ini

@@ -2,14 +2,14 @@
 
 [alembic]
 # path to migration scripts
-script_location = migrations
+script_location = app/migrations
 
 # template used to generate migration files
 # file_template = %%(rev)s_%%(slug)s
 
 # sys.path path, will be prepended to sys.path if present.
 # defaults to the current working directory.
-prepend_sys_path = .
+# prepend_sys_path = .
 
 # timezone to use when rendering the date within the migration file
 # as well as the filename.

app/bin.py

@@ -3,6 +3,11 @@
 from subprocess import call
 
 import click
+from alembic.command import revision, upgrade
+from alembic.config import Config
+
+ini_path = str(pathlib.Path(__file__).parent / "alembic.ini")
+config = Config(ini_path)
 
 # TODO: move all calls to docker into some contextmanager
 # or find proper lib to up and down containers
@@ -14,17 +19,7 @@ def makemigration(description):
     call(["docker-compose", "up", "-d"])
     time.sleep(5)
     try:
-        call(
-            [
-                "poetry",
-                "run",
-                "alembic",
-                "revision",
-                "--autogenerate",
-                "-m",
-                str(description),
-            ]
-        )
+        revision(config, description, True)
         call(["poetry", "run", "pre-commit", "run", "-a"])
     finally:
         call(["docker-compose", "down"])
@@ -33,13 +28,15 @@ def makemigration(description):
 @click.command()
 @click.pass_context
 def recreatemigrations(ctx):
-    py_files = list(pathlib.Path("migrations/versions").glob("*.py"))
+    py_files = list(
+        (pathlib.Path(__file__).parent / "migrations/versions").glob("*.py")
+    )
     if len(py_files) > 1:
         click.echo(
             "You can't recreate initial migration because "
             "you have forward migrations"
         )
-    for py_file in pathlib.Path("migrations/versions").glob("*.py"):
+    for py_file in py_files:
         py_file.unlink()
     ctx.forward(makemigration, description="Initial migration")
 
@@ -48,7 +45,7 @@ def recreatemigrations(ctx):
 @click.argument("revision", required=False)
 def migrate(revision):
     revision = revision or "heads"
-    call(["poetry", "run", "alembic", "upgrade", str(revision)])
+    upgrade(config, revision)
 
 
 @click.command()

migrations/env.py app/migrations/env.py

@@ -2,7 +2,7 @@
 
 Revision ID: ${up_revision}
 Revises: ${down_revision | comma,n}
-Create Date: ${create_date}
+Created Date: ${create_date}
 
 """
 from alembic import op

migrations/script.py.mako app/migrations/script.py.mako

@@ -2,7 +2,7 @@
 
 Revision ID: 0001
 Revises:
-Create Date: 2022-02-13 00:59:50.983274
+Created Date: 2022-05-08 13:30:37.164512
 
 """
 import sqlalchemy as sa

migrations/versions/0001_initial_migration.py app/migrations/versions/0001_initial_migration.py

@@ -55,3 +55,7 @@ exclude = '''
   | \dist
 )/
 '''
+
+[tool.isort]
+profile = "black"
+line_length = 79