From 8ea1c8c6dbddaf07f0ee423793a3ad4c42064c34 Mon Sep 17 00:00:00 2001 From: Sebastiaan Huber Date: Tue, 4 May 2021 09:36:26 +0200 Subject: [PATCH] CLI: set `localhost` as default for database hostname in `verdi setup` The default was actually being defined on the option, however, it was taken from the `pgsu.DEFAULT_DSN` dictionary, which defines the database hostname to be `None`. Still, 9 out of 10 times the database is on the localhost so not having this as a default is kind of annoying and unnecessary. --- aiida/cmdline/params/options/__init__.py | 2 +- aiida/cmdline/params/options/commands/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aiida/cmdline/params/options/__init__.py b/aiida/cmdline/params/options/__init__.py index 16ae5eb95c..accd78c65f 100644 --- a/aiida/cmdline/params/options/__init__.py +++ b/aiida/cmdline/params/options/__init__.py @@ -249,7 +249,7 @@ def decorator(command): '--db-host', type=types.HostnameType(), help='Database server host. Leave empty for "peer" authentication.', - default=DEFAULT_DBINFO['host'] + default='localhost' ) DB_PORT = OverridableOption( diff --git a/aiida/cmdline/params/options/commands/setup.py b/aiida/cmdline/params/options/commands/setup.py index b5cb9f974d..1ec43c82ed 100644 --- a/aiida/cmdline/params/options/commands/setup.py +++ b/aiida/cmdline/params/options/commands/setup.py @@ -259,7 +259,7 @@ def get_quicksetup_password(ctx, param, value): # pylint: disable=unused-argume SETUP_DATABASE_HOSTNAME = QUICKSETUP_DATABASE_HOSTNAME.clone( prompt='Database host', - contextual_default=functools.partial(get_profile_attribute_default, ('database_hostname', DEFAULT_DBINFO['host'])), + contextual_default=functools.partial(get_profile_attribute_default, ('database_hostname', 'localhost')), cls=options.interactive.InteractiveOption )