Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ENV_CONFIG_PATH import back into _get_config_manager #450

Merged
merged 3 commits into from
Apr 23, 2024
Merged

Move ENV_CONFIG_PATH import back into _get_config_manager #450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dc2880
Move ENV_CONFIG_PATH import back into _get_config_manager
Apr 23, 2024
e0fb524
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 23, 2024
4781d7a
Add back a comment
krassowski Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion jupyterlab_server/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from typing import Any

import json5
from jupyter_core.paths import ENV_CONFIG_PATH, SYSTEM_CONFIG_PATH, jupyter_config_dir, jupyter_path
from jupyter_core.paths import SYSTEM_CONFIG_PATH, jupyter_config_dir, jupyter_path
from jupyter_server.services.config.manager import ConfigManager, recursive_update
from jupyter_server.utils import url_path_join as ujoin
from traitlets import Bool, HasTraits, List, Unicode, default
Expand Down Expand Up @@ -370,6 +370,9 @@ def _get_config_manager(level: str, include_higher_levels: bool = False) -> Conf
"""Get the location of config files for the current context
Returns the string to the environment
"""
# Delayed import since this gets monkey-patched in tests
from jupyter_core.paths import ENV_CONFIG_PATH
krassowski marked this conversation as resolved.
Show resolved Hide resolved

allowed = get_allowed_levels()
if level not in allowed:
msg = f"Page config level must be one of: {allowed}"
Expand Down
Loading