From 7ec97e6cd129b63ad7daffed22c06bedc4a8acb3 Mon Sep 17 00:00:00 2001
From: Antoine Lambert <anlambert@softwareheritage.org>
Date: Thu, 11 May 2023 10:57:58 +0200
Subject: [PATCH] api/server: Fix ImportError after config_basepath removal
That function from swh.core.config was removed in swh/devel/swh-core@2663c0a4.
---
swh/vault/api/server.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/swh/vault/api/server.py b/swh/vault/api/server.py
index 5b58d61..e89340b 100644
--- a/swh/vault/api/server.py
+++ b/swh/vault/api/server.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2022 The Software Heritage developers
+# Copyright (C) 2016-2023 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -11,7 +11,7 @@ from typing import Any, Dict, Optional
from swh.core.api import RPCServerApp
from swh.core.api import encode_data_server as encode_data
from swh.core.api import error_handler
-from swh.core.config import config_basepath, merge_configs, read_raw_config
+from swh.core.config import merge_configs, read_raw_config
from swh.vault import get_vault as get_swhvault
from swh.vault.backend import NotFoundExc
from swh.vault.interface import VaultInterface
@@ -110,7 +110,7 @@ def make_app_from_configfile(
if not os.path.isfile(config_path):
raise ValueError(f"Configuration path {config_path} should exist.")
- app_config = read_raw_config(config_basepath(config_path))
+ app_config = read_raw_config(config_path)
app_config["vault"] = check_config(app_config)
app.config.update(merge_configs(DEFAULT_CONFIG, app_config))
--
GitLab