Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] authored and unkcpz committed Nov 19, 2024
1 parent c705267 commit 8408ef5
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/aiida/cmdline/commands/cmd_presto.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def detect_postgres_config(
"""
import secrets

from aiida.manage.configuration.settings import get_configuration_directory
from aiida.manage.configuration.settings import AiiDAConfigPathResolver
from aiida.manage.external.postgres import Postgres

dbinfo = {
Expand All @@ -92,7 +92,7 @@ def detect_postgres_config(
except Exception as exception:
raise ConnectionError(f'Unable to automatically create the PostgreSQL user and database: {exception}')

aiida_config_folder = get_configuration_directory()
aiida_config_folder = AiiDAConfigPathResolver.get_configuration_directory()

return {
'database_hostname': postgres_hostname,
Expand Down
4 changes: 2 additions & 2 deletions src/aiida/cmdline/commands/cmd_profile.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ def profile_list():
# This can happen for a fresh install and the `verdi setup` has not yet been run. In this case it is still nice
# to be able to see the configuration directory, for instance for those who have set `AIIDA_PATH`. This way
# they can at least verify that it is correctly set.
from aiida.manage.configuration.settings import get_configuration_directory
from aiida.manage.configuration.settings import AiiDAConfigPathResolver

echo.echo_report(f'configuration folder: {get_configuration_directory()}')
echo.echo_report(f'configuration folder: {AiiDAConfigPathResolver.get_configuration_directory()}')
echo.echo_critical(str(exception))
else:
echo.echo_report(f'configuration folder: {config.dirpath}')
Expand Down
6 changes: 3 additions & 3 deletions src/aiida/cmdline/commands/cmd_status.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ def verdi_status(print_traceback, no_rmq):
from aiida.common.docs import URL_NO_BROKER
from aiida.common.exceptions import ConfigurationError
from aiida.engine.daemon.client import DaemonException, DaemonNotRunningException
from aiida.manage.configuration.settings import get_configuration_directory
from aiida.manage.configuration.settings import AiiDAConfigPathResolver
from aiida.manage.manager import get_manager

exit_code = ExitCode.SUCCESS
configure_directory = get_configuration_directory()
configure_directory = AiiDAConfigPathResolver.get_configuration_directory()

print_status(ServiceStatus.UP, 'version', f'AiiDA v{__version__}')
print_status(ServiceStatus.UP, 'config', str(configure_directory))
print_status(ServiceStatus.UP, 'config', configure_directory)

manager = get_manager()

Expand Down
5 changes: 3 additions & 2 deletions src/aiida/cmdline/params/options/commands/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ def get_repository_uri_default(ctx):
"""
import os

from aiida.manage.configuration.settings import get_configuration_directory
from aiida.manage.configuration.settings import AiiDAConfigPathResolver

validate_profile_parameter(ctx)
configure_directory = AiiDAConfigPathResolver.get_configuration_directory()

return os.path.join(get_configuration_directory(), 'repository', ctx.params['profile'].name)
return os.path.join(configure_directory, 'repository', ctx.params['profile'].name)


def get_quicksetup_repository_uri(ctx, param, value):
Expand Down
4 changes: 3 additions & 1 deletion src/aiida/storage/sqlite_dos/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ class Model(BaseModel, defer_build=True):
filepath: str = Field(
title='Directory of the backend',
description='Filepath of the directory in which to store data for this backend.',
default_factory=lambda: str(AiiDAConfigPathResolver.get_configuration_directory() / 'repository' / f'sqlite_dos_{uuid4().hex}'),
default_factory=lambda: str(
AiiDAConfigPathResolver.get_configuration_directory() / 'repository' / f'sqlite_dos_{uuid4().hex}'
),
)

@field_validator('filepath')
Expand Down
2 changes: 1 addition & 1 deletion tests/manage/configuration/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
import pytest
from aiida.common import exceptions
from aiida.manage.configuration import Profile, settings
from aiida.manage.configuration.settings import AiiDAConfigPathResolver
from aiida.manage.configuration.config import Config
from aiida.manage.configuration.migrations import CURRENT_CONFIG_VERSION, OLDEST_COMPATIBLE_CONFIG_VERSION
from aiida.manage.configuration.options import get_option
from aiida.manage.configuration.settings import AiiDAConfigPathResolver
from aiida.storage.sqlite_temp import SqliteTempBackend


Expand Down

0 comments on commit 8408ef5

Please sign in to comment.