half-orm-dev 1.0.0a16__tar.gz → 1.0.0a18__tar.gz

{half_orm_dev-1.0.0a16/half_orm_dev.egg-info → half_orm_dev-1.0.0a18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a16
+Version: 1.0.0a18
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

{half_orm_dev-1.0.0a16 → half_orm_dev-1.0.0a18}/half_orm_dev/migration_manager.py

@@ -556,14 +556,25 @@ class MigrationManager:
     def _regenerate_modules_after_migration(
         self, from_version: str, to_version: str
     ) -> None:
-        """Regenerate the project modules after a migration and sync to all active branches.
+        """Regenerate the project modules after a migration on all active branches.
 
-        Runs generate(), commits the changed files on ho-prod, then replays those
-        changes on every active branch by checking out the package directory from ho-prod.
-        Skips silently if generate() produced no changes.
+        Each branch is regenerated against the DB schema that matches its state:
+        - ho-prod          → production schema (schema.sql)
+        - ho-release/X.Y.Z → release schema (release-X.Y.Z.sql), no bootstrap
+        - ho-patch/*       → production schema (schema.sql)
+
+        Bootstrap scripts are NOT run during this restore: the modules may be in
+        an inconsistent state (that is precisely what we are fixing), and running
+        bootstrap would fail trying to import them.
+
+        Stale local branches (no longer on remote) are skipped to avoid pre-commit
+        hook failures.
         """
+        import re as _re
         from half_orm_dev import modules as _modules
 
+        _RELEASE_RE = _re.compile(r'^ho-release/(.+)$')
+
         repo = self._repo
         git_repo = repo.hgit._HGit__git_repo
         package_name = repo.name
@@ -573,21 +584,42 @@ class MigrationManager:
             f"[HOP] Regenerate modules (migration {from_version} → {to_version})"
         )
 
-        # Collect active branches before moving around
+        # Collect active branches, filtering out stale ones (no remote counterpart)
         try:
             branches_status = repo.hgit.get_active_branches_status()
         except Exception:
             branches_status = {}
 
-        patch_branches = [b['name'] for b in branches_status.get('patch_branches', [])]
-        release_branches = [b['name'] for b in branches_status.get('release_branches', [])]
-        # ho-staged/* branches are frozen after merge — excluded from module regeneration
+        patch_branches = [
+            b['name'] for b in branches_status.get('patch_branches', [])
+            if b.get('exists_on_remote', True)
+        ]
+        release_branches = [
+            b['name'] for b in branches_status.get('release_branches', [])
+            if b.get('exists_on_remote', True)
+        ]
         all_branches = ['ho-prod'] + release_branches + patch_branches
 
         for branch in all_branches:
             try:
                 repo.hgit.checkout(branch)
-                # generate() reads existing files and preserves developer code sections
+
+                # Restore the DB to the schema appropriate for this branch so
+                # generate() introspects the right set of relations.
+                m = _RELEASE_RE.match(branch)
+                if m:
+                    release_version = m.group(1)
+                    release_schema = repo.get_release_schema_path(release_version)
+                    if release_schema.exists():
+                        repo.restore_database_from_release_schema(
+                            release_version, skip_bootstrap=True
+                        )
+                    else:
+                        repo.restore_database_from_schema(skip_bootstrap=True)
+                else:
+                    # ho-prod and ho-patch/*: use production schema
+                    repo.restore_database_from_schema(skip_bootstrap=True)
+
                 _modules.generate(repo)
                 repo.hgit.add(package_dir)
                 if not git_repo.git.diff('--cached', '--name-only').strip():
@@ -597,8 +629,8 @@ class MigrationManager:
                     repo.hgit.push_branch(branch)
                 except Exception as push_err:
                     sys.stderr.write(
-                        f"Warning: could not push {branch} after module regeneration "
-                        f"(diverged branch?): {push_err}\n"
+                        f"Warning: could not push {branch} after module regeneration: "
+                        f"{push_err}\n"
                     )
             except Exception as e:
                 sys.stderr.write(

{half_orm_dev-1.0.0a16 → half_orm_dev-1.0.0a18}/half_orm_dev/release_manager.py

@@ -2586,7 +2586,34 @@ class ReleaseManager:
                 # snapshot changes (which delete the TOML), we commit everything as
                 # a single merge commit with no conflict.
                 self._repo.hgit.checkout("ho-prod")
-                self._repo.hgit.merge(release_branch, no_commit=True)
+                try:
+                    self._repo.hgit.merge(release_branch, no_commit=True)
+                except GitCommandError:
+                    # ho_baseclasses.py is auto-generated and may conflict when the
+                    # file was introduced by a half_orm_dev migration AFTER the release
+                    # branch was cut (CONFLICT add/add).  The release branch always
+                    # holds the correct post-patch version, so we take --theirs.
+                    git_repo = self._repo.hgit._HGit__git_repo
+                    conflicted = git_repo.git.diff(
+                        '--name-only', '--diff-filter=U'
+                    ).splitlines()
+                    package = self._repo.name
+                    auto_generated = {f'{package}/ho_baseclasses.py'}
+                    unexpected = set(conflicted) - auto_generated
+                    if unexpected:
+                        raise ReleaseManagerError(
+                            f"Merge conflict(s) in non-auto-generated file(s): "
+                            + ', '.join(sorted(unexpected))
+                        )
+                    if not conflicted:
+                        raise  # no conflicted files listed — unexpected state
+                    for path in conflicted:
+                        git_repo.git.checkout('--theirs', path)
+                        git_repo.git.add(path)
+                    click.echo(
+                        f"  ℹ Resolved add/add conflict in {', '.join(conflicted)} "
+                        f"(took release branch version)"
+                    )
 
                 # 10. Generate schema dump and apply snapshot changes in merge window
                 self._repo.database._generate_schema_sql(version, model_dir)

{half_orm_dev-1.0.0a16 → half_orm_dev-1.0.0a18}/half_orm_dev/repo.py

@@ -32,6 +32,7 @@ from half_orm_dev.patch_manager import PatchManager, PatchManagerError
 from half_orm_dev.release_manager import ReleaseManager, ReleaseManagerError
 from half_orm_dev.migration_manager import MigrationManager, MigrationManagerError
 from half_orm_dev.release_file import ReleaseFile, ReleaseFileError
+from half_orm_dev.bootstrap_manager import BootstrapManager
 
 from .utils import TEMPLATE_DIRS, hop_version
 
@@ -2394,7 +2395,7 @@ Each script is executed only once unless `--force` is used.
             self.model.execute_query('CREATE SCHEMA public')
             self.model.execute_query('GRANT ALL ON SCHEMA public TO public')
 
-    def restore_database_from_schema(self, exclude_bootstrap_patch_id: Optional[str] = None, exclude_bootstrap_version: Optional[str] = None) -> None:
+    def restore_database_from_schema(self, exclude_bootstrap_patch_id: Optional[str] = None, exclude_bootstrap_version: Optional[str] = None, skip_bootstrap: bool = False) -> None:
         """
         Restore database from model/schema.sql, metadata, and data files.
 
@@ -2511,16 +2512,18 @@ Each script is executed only once unless `--force` is used.
             # In promote context: exclude_bootstrap_version skips the version being
             # promoted (its bootstraps don't run during promote, they run via upgrade).
             # up_to_version prevents bootstraps from future versions from running.
-            from half_orm_dev.bootstrap_manager import BootstrapManager
-            bootstrap_mgr = BootstrapManager(self)
-            result = bootstrap_mgr.run_bootstrap(
-                exclude_patch_id=exclude_bootstrap_patch_id,
-                exclude_version=exclude_bootstrap_version,
-                up_to_version=exclude_bootstrap_version
-            )
-            if result['errors']:
-                error_msg = "\n".join([f"  • {f}: {e}" for f, e in result['errors']])
-                raise RepoError(f"Bootstrap execution failed:\n{error_msg}")
+            # skip_bootstrap=True is used when regenerating modules after migration
+            # (bootstrap validation belongs only in patch merge / release promote prod).
+            if not skip_bootstrap:
+                bootstrap_mgr = BootstrapManager(self)
+                result = bootstrap_mgr.run_bootstrap(
+                    exclude_patch_id=exclude_bootstrap_patch_id,
+                    exclude_version=exclude_bootstrap_version,
+                    up_to_version=exclude_bootstrap_version
+                )
+                if result['errors']:
+                    error_msg = "\n".join([f"  • {f}: {e}" for f, e in result['errors']])
+                    raise RepoError(f"Bootstrap execution failed:\n{error_msg}")
 
         except RepoError:
             # Re-raise RepoError as-is
@@ -2660,7 +2663,8 @@ Each script is executed only once unless `--force` is used.
         self,
         version: str,
         exclude_bootstrap_patch_id: Optional[str] = None,
-        exclude_bootstrap_version: Optional[str] = None
+        exclude_bootstrap_version: Optional[str] = None,
+        skip_bootstrap: bool = False
     ) -> None:
         """
         Restore database from release schema file.
@@ -2708,15 +2712,15 @@ Each script is executed only once unless `--force` is used.
             # Reload half_orm metadata cache
             self.model.reconnect(reload=True)
 
-            # Execute bootstrap scripts
-            # up_to_version prevents bootstraps from future versions from running.
-            from half_orm_dev.bootstrap_manager import BootstrapManager
-            bootstrap_mgr = BootstrapManager(self)
-            bootstrap_mgr.run_bootstrap(
-                exclude_patch_id=exclude_bootstrap_patch_id,
-                exclude_version=exclude_bootstrap_version,
-                up_to_version=exclude_bootstrap_version
-            )
+            # Execute bootstrap scripts (skip during module regeneration — the
+            # modules may be in an inconsistent state at that point)
+            if not skip_bootstrap:
+                bootstrap_mgr = BootstrapManager(self)
+                bootstrap_mgr.run_bootstrap(
+                    exclude_patch_id=exclude_bootstrap_patch_id,
+                    exclude_version=exclude_bootstrap_version,
+                    up_to_version=exclude_bootstrap_version
+                )
 
         except Exception as e:
             raise RepoError(f"Failed to restore from release schema: {e}") from e

half_orm_dev-1.0.0a18/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a18

{half_orm_dev-1.0.0a16 → half_orm_dev-1.0.0a18/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a16
+Version: 1.0.0a18
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

half_orm_dev-1.0.0a16/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a16