[CLI]: make top-level verdi pluginable via entry points

docs/source/reference/command_line.rst

@@ -80,8 +80,7 @@ Below is a list with all available subcommands.
       list       List the available codes.
       relabel    Relabel a code.
       reveal     Reveal one or more hidden codes in `verdi code list`.
-      setup      Setup a new code (use `verdi code create`). (DEPRECATED: Please use `verdi
-                 code create` instead.)
+      setup      (Deprecated) Setup a new code (use `verdi code create`).
       show       Display detailed information for a code.
       test       Run tests for the given code to check whether it is usable.
 
@@ -402,8 +401,7 @@ Below is a list with all available subcommands.
       dump                Dump all data in an AiiDA profile's storage to disk.
       list                Display a list of all available profiles.
       set-default         Set a profile as the default profile.
-      setdefault          Set a profile as the default profile. (DEPRECATED: Please use `verdi
-                          profile set-default` instead.)
+      setdefault          (Deprecated) Set a profile as the default profile.
       setup               Set up a new profile.
       show                Show details for a profile.
 
@@ -417,9 +415,7 @@ Below is a list with all available subcommands.
 
     Usage:  [OPTIONS]
 
-      Setup a new profile in a fully automated fashion. (DEPRECATED: This command is
-      deprecated. For a fully automated alternative, use `verdi presto --use-postgres`
-      instead. For full control, use `verdi profile setup core.psql_dos`.)
+      (Deprecated) Setup a new profile in a fully automated fashion.
 
     Options:
       -n, --non-interactive / -I, --interactive
@@ -457,7 +453,7 @@ Below is a list with all available subcommands.
       --broker-host HOSTNAME          Hostname for the message broker.  [default: 127.0.0.1]
       --broker-port INTEGER           Port for the message broker.  [default: 5672]
       --broker-virtual-host TEXT      Name of the virtual host for the message broker without
-                                      leading forward slash.  [default: ""]
+                                      leading forward slash.
       --repository DIRECTORY          Absolute path to the file repository.
       --test-profile                  Designate the profile to be used for running the test
                                       suite only.
@@ -523,10 +519,10 @@ Below is a list with all available subcommands.
 
     Usage:  [OPTIONS]
 
-      Setup a new profile (use `verdi profile setup`).
+      (Deprecated) Setup a new profile (use `verdi profile setup`).
 
       This method assumes that an empty PSQL database has been created and that the database
-      user has been created. (DEPRECATED: Please use `verdi profile setup` instead.)
+      user has been created.
 
     Options:
       -n, --non-interactive / -I, --interactive

src/aiida/cmdline/commands/cmd_verdi.py

@@ -12,12 +12,14 @@
 
 from aiida import __version__
 
-from ..groups import VerdiCommandGroup
 from ..params import options, types
+from ..utils.pluginable import Pluginable
 
 
 # Pass the version explicitly to ``version_option`` otherwise editable installs can show the wrong version number
-@click.group(cls=VerdiCommandGroup, context_settings={'help_option_names': ['--help', '-h']})
+@click.group(
+    cls=Pluginable, entry_point_group='aiida.cmdline.verdi', context_settings={'help_option_names': ['--help', '-h']}
+)
 @options.PROFILE(type=types.ProfileParamType(load_profile=True), expose_value=False)
 @options.VERBOSITY()
 @click.version_option(__version__, package_name='aiida_core', message='AiiDA version %(version)s')

src/aiida/cmdline/utils/pluginable.py

@@ -29,7 +29,7 @@ def list_commands(self, ctx):
         if not self._exclude_external_plugins:
             subcommands.extend(get_entry_point_names(self._entry_point_group))
 
-        return subcommands
+        return sorted(subcommands)
 
     def get_command(self, ctx, name):
         """Try to load a subcommand from entry points, else defer to super."""

src/aiida/plugins/entry_point.py

@@ -87,6 +87,7 @@ class EntryPointFormat(enum.Enum):
     'aiida.cmdline.computer.configure': 'aiida.cmdline.computer.configure',
     'aiida.cmdline.data': 'aiida.cmdline.data',
     'aiida.cmdline.data.structure.import': 'aiida.cmdline.data.structure.import',
+    'aiida.cmdline.verdi': 'aiida.cmdline.verdi',
     'aiida.data': 'aiida.orm.nodes.data',
     'aiida.groups': 'aiida.orm.groups',
     'aiida.orm': 'aiida.orm',