Merge branch 'main' into use-hatch

jupyter-server · May 27, 2022 · 222efd6 · 222efd6
2 parents 4980d7a + d5f2ad9
commit 222efd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docs/source/users/configuration.rst b/docs/source/users/configuration.rst
@@ -24,7 +24,7 @@ By default, Jupyter Server looks for server-specific configuration in a ``jupyte
         /Users/username/Library/Jupyter/runtime
 
 
-The paths under ``config`` are listed in order of precedence. If the same trait is listed in multiple places, it will be set to the value from the file will highest precendence.
+The paths under ``config`` are listed in order of precedence. If the same trait is listed in multiple places, it will be set to the value from the file with the highest precendence.
 
 
 Jupyter Server uses IPython's traitlets system for configuration. Traits can be

diff --git a/jupyter_server/services/sessions/sessionmanager.py b/jupyter_server/services/sessions/sessionmanager.py
@@ -1,6 +1,7 @@
 """A base class session manager."""
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
+import os
 import pathlib
 import uuid
 
@@ -272,7 +273,9 @@ async def start_kernel_for_session(self, session_id, path, name, type, kernel_na
         # allow contents manager to specify kernels cwd
         kernel_path = self.contents_manager.get_kernel_path(path=path)
         kernel_id = await self.kernel_manager.start_kernel(
-            path=kernel_path, kernel_name=kernel_name
+            path=kernel_path,
+            kernel_name=kernel_name,
+            env={**os.environ, "JPY_SESSION_NAME": path},
         )
         return kernel_id