⬆️ fix: alembic>=1.16

Author: ProgramRipper

nonebot_plugin_orm/__main__.py

@@ -63,7 +63,7 @@ def orm(ctx: click.Context, config: Path, name: str, **_) -> None:
                 options,
             )
 
-        ctx.obj = AlembicConfig(config, name, cmd_opts=cmd_opts)
+        ctx.obj = AlembicConfig(config, ini_section=name, cmd_opts=cmd_opts)
 
     ctx.call_on_close(ctx.obj.close)
 

nonebot_plugin_orm/exception.py

@@ -6,5 +6,5 @@ class CommandError(ClickException, util.CommandError):
     pass
 
 
-class AutogenerateDiffsDetected(CommandError, util.AutogenerateDiffsDetected):
+class AutogenerateDiffsDetected(util.AutogenerateDiffsDetected, CommandError):
     pass

nonebot_plugin_orm/migrate.py

@@ -80,6 +80,7 @@ class AlembicConfig(Config):
     def __init__(
         self,
         file_: str | os.PathLike[str] | None = None,
+        toml_file: str | os.PathLike[str] | None = None,
         ini_section: str = "alembic",
         output_buffer: TextIO | None = None,
         stdout: TextIO = sys.stdout,
@@ -114,6 +115,7 @@ def __init__(
 
         super().__init__(
             file_,
+            toml_file,
             ini_section,
             output_buffer,
             stdout,
@@ -189,7 +191,7 @@ def move_script(self, script: Script) -> Path:
             return script_path
 
         version_location.mkdir(parents=True, exist_ok=True)
-        return shutil.move(script.path, version_location)
+        return Path(shutil.move(script.path, version_location))
 
     def _add_post_write_hook(self, name: str, **kwargs: str) -> None:
         self.set_section_option(
@@ -564,7 +566,9 @@ def retrieve_migrations(
     migration_script = revision_context.generated_revisions[-1]
     diffs = cast(UpgradeOps, migration_script.upgrade_ops).as_diffs()
     if diffs:
-        raise AutogenerateDiffsDetected(f"检测到新的升级操作:\n{pformat(diffs)}")
+        raise AutogenerateDiffsDetected(
+            f"检测到新的升级操作:\n{pformat(diffs)}", revision_context, diffs
+        )
     else:
         config.print_stdout("没有检测到新的升级操作")
 

pdm.lock

@@ -7,7 +7,7 @@ authors = [
     { name = "ProgramRipper", email = "[email protected]" },
 ]
 dependencies = [
-    "alembic~=1.13,<1.15",
+    "alembic~=1.16",
     "click~=8.1",
     "importlib-metadata>=4.6; python_version < \"3.10\"",
     "importlib-resources>=5.12; python_version < \"3.12\"",