diff --git a/services/web/server/src/simcore_service_webserver/cli_config.py b/services/web/server/src/simcore_service_webserver/cli_config.py index 65838d339fc..e844641f740 100644 --- a/services/web/server/src/simcore_service_webserver/cli_config.py +++ b/services/web/server/src/simcore_service_webserver/cli_config.py @@ -6,8 +6,7 @@ import trafaret_config import trafaret_config.commandline as commandline -from .resources_keys import RSC_CONFIG_DIR_KEY -from .resources import resources +from .resources import resources, RSC_CONFIG_DIR_KEY log = logging.getLogger(__name__) diff --git a/services/web/server/src/simcore_service_webserver/resources.py b/services/web/server/src/simcore_service_webserver/resources.py index 6ce1d3be591..2a8b9fe369f 100644 --- a/services/web/server/src/simcore_service_webserver/resources.py +++ b/services/web/server/src/simcore_service_webserver/resources.py @@ -3,8 +3,8 @@ """ from servicelib.resources import ResourcesFacade -# pylint: disable=unused-import -from .resources_keys import RSC_CONFIG_DIR_KEY +# RSC=resource +RSC_CONFIG_DIR_KEY = __name__ + ".config" resources = ResourcesFacade( package_name=__name__, diff --git a/services/web/server/src/simcore_service_webserver/resources_keys.py b/services/web/server/src/simcore_service_webserver/resources_keys.py deleted file mode 100644 index a6ede7535ee..00000000000 --- a/services/web/server/src/simcore_service_webserver/resources_keys.py +++ /dev/null @@ -1,20 +0,0 @@ -""" Namespace to keep keys to identify resources - - -See resources module -""" -from .__version__ import get_version_object - -package_version = get_version_object() - - -API_MAJOR_VERSION = package_version.major -API_URL_VERSION = "v{:.0f}".format(API_MAJOR_VERSION) - -# RSC=resource -RSC_CONFIG_DIR_KEY = "config" -#RSC_OPENAPI_DIR_KEY = "oas3/{}".format(API_URL_VERSION) -#RSC_OPENAPI_ROOTFILE_KEY = "{}/openapi.yaml".format(RSC_OPENAPI_DIR_KEY) -RSC_CONFIG_DIR_KEY = "config" - -# RSC_CONFIG_SCHEMA_KEY = RSC_CONFIG_DIR_KEY + "/config-schema-v1.json"