half-orm-dev 0.17.2a10__tar.gz → 0.17.3a1__tar.gz

{half_orm_dev-0.17.2a10/half_orm_dev.egg-info → half_orm_dev-0.17.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a10
+Version: 0.17.3a1
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
 Requires-Dist: pytest
-Requires-Dist: half_orm<0.18.0,>=0.17.0
+Requires-Dist: half_orm<0.18.0,>=0.17.1
 Requires-Dist: tomli>=2.0.0; python_version < "3.11"
 Requires-Dist: tomli_w>=1.0.0
 Dynamic: license-file

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev/cli/commands/migrate.py

@@ -27,6 +27,7 @@ def migrate(verbose: bool) -> None:
       • Must be on ho-prod branch
       • Repository must be clean (no uncommitted changes)
 
+    \b
     Process:
       1. Detects version mismatch between installed half_orm_dev and repository
       2. Applies any migration scripts for intermediate versions
@@ -34,6 +35,7 @@ def migrate(verbose: bool) -> None:
       4. Creates migration commit on ho-prod
       5. Syncs .hop/ directory to all active branches
 
+    \b
     Examples:
         # After upgrading half_orm_dev
         $ pip install --upgrade half_orm_dev
@@ -41,11 +43,13 @@ def migrate(verbose: bool) -> None:
         ⚠️  Migration needed: half_orm_dev 0.17.2 → 0.18.0
           Current branch: ho-prod
 
+    \b
           Running migrations...
           ✓ Applied migration: 0.17.2 → 0.18.0
           ✓ Updated .hop/config: hop_version = 0.18.0
           ✓ Synced .hop/ to active branches
 
+    \b
         # View detailed migration info
         $ half_orm dev migrate --verbose
     """
@@ -62,25 +66,6 @@ def migrate(verbose: bool) -> None:
         installed_version = hop_version()
         config_version = repo._Repo__config.hop_version if hasattr(repo, '_Repo__config') else '0.0.0'
 
-        # Check if migration is needed
-        comparison = repo.compare_versions(installed_version, config_version)
-
-        if comparison == 0:
-            # Versions are equal - no migration needed
-            click.echo(f"✓ {utils.Color.green('Repository is up to date')}")
-            click.echo(f"  Repository version: {config_version}")
-            click.echo(f"  Installed version:  {installed_version}")
-            return
-
-        elif comparison < 0:
-            # Installed version is OLDER than repository version
-            click.echo(f"⚠️  {utils.Color.red('Installed half_orm_dev is older than repository version')}", err=True)
-            click.echo(f"\n  Repository version: {config_version}", err=True)
-            click.echo(f"  Installed version:  {installed_version}", err=True)
-            click.echo(f"\n  Please upgrade half_orm_dev:", err=True)
-            click.echo(f"    pip install --upgrade half_orm_dev\n", err=True)
-            raise click.Abort()
-
         # Migration needed (comparison > 0)
         click.echo(f"⚠️  {utils.Color.bold('Migration needed:')}")
         click.echo(f"  half_orm_dev {config_version} → {installed_version}")
@@ -90,29 +75,34 @@ def migrate(verbose: bool) -> None:
         click.echo(f"  Current branch: {current_branch}")
         click.echo()
 
-        # Run migrations
-        click.echo(f"  Running migrations...")
-
-        try:
-            result = repo.run_migrations_if_needed(silent=False)
-
-            if result['migration_run']:
-                click.echo(f"\n✓ {utils.Color.green('Migration completed successfully')}")
-                click.echo(f"  Updated .hop/config: hop_version = {installed_version}")
 
-                if verbose and result.get('errors'):
-                    click.echo(f"\n⚠️  Warnings during migration:")
-                    for error in result['errors']:
-                        click.echo(f"  • {error}")
-
-                click.echo(f"\n✓ Synced .hop/ to active branches")
-            else:
-                click.echo(f"✓ {utils.Color.green('Repository is up to date')}")
-
-        except RepoError as e:
-            # Migration failed or branch check failed
-            click.echo(utils.Color.red(f"\n❌ {e}"), err=True)
-            raise click.Abort()
+        # Run migrations
+        if not click.confirm("Do you want to proceed?", default=False):
+            click.echo()
+            click.echo("If you want to revert half_orm_dev run:")
+            click.echo(f"  pip install half-orm-dev=={config_version}")
+        else:
+            try:
+                click.echo(f"  Running migrations...")
+                result = repo.run_migrations_if_needed(silent=False)
+
+                if result['migration_run']:
+                    click.echo(f"\n✓ {utils.Color.green('Migration completed successfully')}")
+                    click.echo(f"  Updated .hop/config: hop_version = {installed_version}")
+
+                    if verbose and result.get('errors'):
+                        click.echo(f"\n⚠️  Warnings during migration:")
+                        for error in result['errors']:
+                            click.echo(f"  • {error}")
+
+                    click.echo(f"\n✓ Synced .hop/ to active branches")
+                else:
+                    click.echo(f"✓ {utils.Color.green('Repository is up to date')}")
+
+            except RepoError as e:
+                # Migration failed or branch check failed
+                click.echo(utils.Color.red(f"\n❌ {e}"), err=True)
+                raise click.Abort()
 
     except RepoError as e:
         click.echo(utils.Color.red(f"❌ Error: {e}"), err=True)

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev/cli/main.py

@@ -4,6 +4,7 @@ Main CLI module - Creates and configures the CLI group
 
 import click
 import functools
+import sys
 from half_orm_dev.repo import Repo, OutdatedHalfORMDevError
 from half_orm import utils
 from .commands import ALL_COMMANDS
@@ -118,8 +119,9 @@ def create_cli_group():
                 click.echo(f"\n  Your installed version is OLDER than the repository requirement.", err=True)
                 click.echo(f"  All commands are blocked for safety.", err=True)
                 click.echo(f"\n  Please upgrade half_orm_dev:", err=True)
-                click.echo(f"    {utils.Color.bold('pip install --upgrade half_orm_dev')}", err=True)
+                click.echo(f"    {utils.Color.bold(f'pip install --upgrade half_orm_dev=={error.required_version}')}", err=True)
                 click.echo("\n" + "=" * 70 + "\n", err=True)
+                sys.exit(1)
                 raise click.Abort()
             return f(*args, **kwargs)
         return wrapper
@@ -132,24 +134,6 @@ def create_cli_group():
                 cmd.callback = check_version_before_invoke(cmd.callback)
             super().add_command(cmd, name)
 
-        def resolve_command(self, ctx, args):
-            """Override to show available commands when command not found."""
-            try:
-                return super().resolve_command(ctx, args)
-            except click.UsageError as e:
-                if 'No such command' in str(e):
-                    # Command not found - show available commands
-                    click.echo(f"\n❌ {str(e)}", err=True)
-                    click.echo(f"\n{utils.Color.bold('Available commands:')}")
-                    for cmd_name in hop.available_commands:
-                        cmd = self.commands.get(cmd_name)
-                        if cmd:
-                            help_text = cmd.help or cmd.short_help or ""
-                            first_line = help_text.split('\n')[0] if help_text else ""
-                            click.echo(f"  • {utils.Color.bold(cmd_name)}: {first_line}")
-                    click.echo(f"\nTry {utils.Color.bold('half_orm dev <command> --help')} for more information.\n")
-                raise
-
     @click.group(cls=VersionCheckGroup, invoke_without_command=True)
     @click.pass_context
     @check_version_before_invoke

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev/cli_extension.py

@@ -9,7 +9,7 @@ Generates/Patches/Synchronizes a hop Python package with a PostgreSQL database.
 """
 
 import sys
-from half_orm.cli_utils import create_and_register_extension
+from half_orm.cli import CustomGroup
 from .cli import create_cli_group
 
 
@@ -25,7 +25,7 @@ def add_commands(main_group):
     dev_group = create_cli_group()
 
     # Register it as an extension
-    @create_and_register_extension(main_group, sys.modules[__name__])
+    @main_group.group(name='dev', cls=CustomGroup)
     def dev():
         """halfORM development tools - project management, patches, and database synchronization"""
         pass

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev/hgit.py

@@ -113,6 +113,10 @@ class HGit:
                 f'Something went wrong initializing git repo in {base_dir}\n{err}\n', exit_code=1)
         return self
 
+    @property
+    def git_repo(self):
+        return self.__git_repo
+
     @property
     def branch(self):
         "Returns the active branch"

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev/repo.py

@@ -452,7 +452,7 @@ class Repo:
 
             if not self.hgit or self.hgit.branch != 'ho-prod':
                 # Check if working directory is clean
-                if self.hgit and self.hgit.repo.is_dirty(untracked_files=False):
+                if self.hgit and self.hgit.git_repo.is_dirty(untracked_files=False):
                     config_version = self.__config.hop_version if hasattr(self, '_Repo__config') else '0.0.0'
                     raise RepoError(
                         f"Repository migration required but working directory has uncommitted changes.\n\n"
@@ -761,7 +761,7 @@ class Repo:
         current_branch = None
         git_repo = None
         try:
-            git_repo = self.hgit.repo
+            git_repo = self.hgit.git_repo
             current_branch = git_repo.active_branch.name
 
             # Check if working directory is clean
@@ -1429,7 +1429,7 @@ class Repo:
             current_branch = None
             git_repo = None
             try:
-                git_repo = self.hgit.repo
+                git_repo = self.hgit.git_repo
                 current_branch = git_repo.active_branch.name
 
                 # Check if working directory is clean (only in non-silent mode)

half_orm_dev-0.17.3a1/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.17.3-a1

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a10
+Version: 0.17.3a1
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
 Requires-Dist: pytest
-Requires-Dist: half_orm<0.18.0,>=0.17.0
+Requires-Dist: half_orm<0.18.0,>=0.17.1
 Requires-Dist: tomli>=2.0.0; python_version < "3.11"
 Requires-Dist: tomli_w>=1.0.0
 Dynamic: license-file

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/half_orm_dev.egg-info/requires.txt

@@ -2,7 +2,7 @@ GitPython
 click
 pydash
 pytest
-half_orm<0.18.0,>=0.17.0
+half_orm<0.18.0,>=0.17.1
 tomli_w>=1.0.0
 
 [:python_version < "3.11"]

{half_orm_dev-0.17.2a10 → half_orm_dev-0.17.3a1}/setup.py

@@ -11,11 +11,21 @@ from pathlib import Path
 from setuptools import setup
 
 
+# Special minimum version requirements for half_orm
+# List of (major, minor, min_patch, max_patch, required_half_orm_version)
+# Example: (0, 17, 3, 5, '0.17.1') means:
+#   for half_orm_dev 0.17.x where 3 <= x < 5, require half_orm >= 0.17.1
+HALF_ORM_MIN_VERSIONS = [
+    (0, 17, 3, None, '0.17.1'),  # 0.17.3+ requires half_orm >= 0.17.1 (CustomGroup support)
+]
+
+
 def get_half_orm_version_constraint():
     """
     Calculate half_orm version constraint from half_orm_dev version.
 
-    For version X.Y.Z[-xxx], returns: half_orm>=X.Y.0,<X.(Y+1).0
+    For version X.Y.Z[-xxx], returns: half_orm>=X.Y.MIN,<X.(Y+1).0
+    where MIN is determined by HALF_ORM_MIN_VERSIONS or defaults to 0
     """
     version_file = Path(__file__).parent / "half_orm_dev" / "version.txt"
     version_text = version_file.read_text(encoding="utf-8").strip()
@@ -27,10 +37,18 @@ def get_half_orm_version_constraint():
         raise ValueError(f"Invalid version format in version.txt: {version_text}")
 
     major, minor, patch = match.groups()
-    major, minor = int(major), int(minor)
+    major, minor, patch = int(major), int(minor), int(patch)
+
+    # Check for special minimum version requirements
+    min_version = f"{major}.{minor}.0"  # Default
+    for req_major, req_minor, min_patch, max_patch, required_version in HALF_ORM_MIN_VERSIONS:
+        if major == req_major and minor == req_minor:
+            # Check if patch is in range [min_patch, max_patch)
+            if patch >= min_patch:
+                if max_patch is None or patch < max_patch:
+                    min_version = required_version
+                    break
 
-    # Generate constraint: half_orm>=X.Y.0,<X.(Y+1).0
-    min_version = f"{major}.{minor}.0"
     max_version = f"{major}.{minor + 1}.0"
 
     return f"half_orm>={min_version},<{max_version}"

half_orm_dev-0.17.2a10/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.17.2-a10