fix bug where no init commands with multiple subcommands was not hono…

…ring the django_params list
django-commons · Jan 24, 2024 · 7a153f0 · 7a153f0
1 parent b010430
commit 7a153f0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 32 deletions.
diff --git a/django_typer/__init__.py b/django_typer/__init__.py
@@ -327,7 +327,12 @@ def common_params(self):
 
 class TyperGroupWrapper(DjangoAdapterMixin, CoreTyperGroup):
     def common_params(self):
-        if hasattr(self, "django_command") and self.django_command._has_callback:
+        if (
+            (
+                hasattr(self, "django_command") and
+                self.django_command._has_callback
+            ) or getattr(self, "common_init", False)
+        ):
             return [
                 param
                 for param in _get_common_params()
@@ -742,9 +747,9 @@ def get_ctor(attr):
                     cls=type(
                         "_AdaptedCallback",
                         (TyperGroupWrapper,),
-                        {"django_command": cls, "callback_is_method": False},
+                        {"django_command": cls, "callback_is_method": False, "common_init": True},
                     )
-                )(_common_options)
+                )(lambda: None)
 
         super().__init__(name, bases, attrs, **kwargs)
 

diff --git a/django_typer/management/commands/shellcompletion.py b/django_typer/management/commands/shellcompletion.py
@@ -20,7 +20,7 @@
 from typer import Argument, Option, echo
 from typer.completion import Shells, completion_init
 
-from django_typer import COMPLETE_VAR, TyperCommand, command, get_command
+from django_typer import COMPLETE_VAR, TyperCommand, command, get_command, initialize
 
 try:
     from shellingham import detect_shell

diff --git a/django_typer/tests/test_app/helps/groups.txt b/django_typer/tests/test_app/helps/groups.txt
@@ -1,4 +1,3 @@
-
  Usage: ./manage.py groups [OPTIONS] COMMAND [ARGS]...                          
 
  Test multiple groups commands and callbacks                                    
@@ -7,31 +6,18 @@
 │ --help          Show this message and exit.                                  │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Django ─────────────────────────────────────────────────────────────────────╮
-│ --version                                     Show program's version number  │
-│                                               and exit.                      │
-│ --verbosity          INTEGER RANGE [0<=x<=3]  Verbosity level; 0=minimal     │
-│                                               output, 1=normal output,       │
-│                                               2=verbose output, 3=very       │
-│                                               verbose output                 │
-│                                               [default: 1]                   │
-│ --settings           TEXT                     The Python path to a settings  │
-│                                               module, e.g.                   │
-│                                               "myproject.settings.main". If  │
-│                                               this isn't provided, the       │
-│                                               DJANGO_SETTINGS_MODULE         │
-│                                               environment variable will be   │
-│                                               used.                          │
-│ --pythonpath         PATH                     A directory to add to the      │
-│                                               Python path, e.g.              │
-│                                               "/home/djangoprojects/myproje… │
-│                                               [default: None]                │
-│ --traceback                                   Raise on CommandError          │
-│                                               exceptions                     │
-│ --no-color                                    Don't colorize the command     │
-│                                               output.                        │
-│ --force-color                                 Force colorization of the      │
-│                                               command output.                │
-│ --skip-checks                                 Skip system checks.            │
+│ --version                  Show program's version number and exit.           │
+│ --settings           TEXT  The Python path to a settings module, e.g.        │
+│                            "myproject.settings.main". If this isn't          │
+│                            provided, the DJANGO_SETTINGS_MODULE environment  │
+│                            variable will be used.                            │
+│ --pythonpath         PATH  A directory to add to the Python path, e.g.       │
+│                            "/home/djangoprojects/myproject".                 │
+│                            [default: None]                                   │
+│ --traceback                Raise on CommandError exceptions                  │
+│ --no-color                 Don't colorize the command output.                │
+│ --force-color              Force colorization of the command output.         │
+│ --skip-checks              Skip system checks.                               │
 ╰──────────────────────────────────────────────────────────────────────────────╯
 ╭─ Commands ───────────────────────────────────────────────────────────────────╮
 │ echo          Echo the given message.                                        │

diff --git a/django_typer/tests/test_app2/helps/groups.txt b/django_typer/tests/test_app2/helps/groups.txt
@@ -12,8 +12,6 @@
 │                                               2=verbose output, 3=very       │
 │                                               verbose output                 │
 │                                               [default: 1]                   │
-│ --version                                     Show program's version number  │
-│                                               and exit.                      │
 │ --settings           TEXT                     The Python path to a settings  │
 │                                               module, e.g.                   │
 │                                               "myproject.settings.main". If  │

diff --git a/django_typer/tests/test_app2/management/commands/groups.py b/django_typer/tests/test_app2/management/commands/groups.py
@@ -16,6 +16,12 @@ class Command(GroupsCommand, epilog="Overridden from test_app."):
     precision = 2
     verbosity = 1
 
+    django_params = [
+        param
+        for param in GroupsCommand.django_params
+        if param != 'version'
+    ]
+
     @initialize()
     def init(self, verbosity: types.Verbosity = verbosity):
         """