Merge branch 'master' into refactor-gateway-km

Author: kevin-bates

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.6.3
+
+([Full Changelog](https://github.com/jupyter-server/jupyter_server/compare/v1.6.2...aa2636795ae1d87e3055febb3931f891dd6b4451))
+
+### Merges
+
+- Gate anyio version. [2b51ee3](https://github.com/jupyter-server/jupyter_server/commit/2b51ee37bdad305cb349e246c8ba94381cdb2048)
+- Fix activity tracking and nudge issues when kernel ports change on restarts [#482](https://github.com/jupyter-server/jupyter_server/pull/482) ([@kevin-bates](https://github.com/kevin-bates))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter-server/jupyter_server/graphs/contributors?from=2021-04-16&to=2021-04-21&type=c))
+
+[@kevin-bates](https://github.com/search?q=repo%3Ajupyter-server%2Fjupyter_server+involves%3Akevin-bates+updated%3A2021-04-16..2021-04-21&type=Issues)
+
+
 ## 1.6.2
 
 ### Enhancements made

jupyter_server/extension/application.py

@@ -477,13 +477,18 @@ def initialize_server(cls, argv=[], load_other_extensions=True, **kwargs):
         The `launch_instance` method uses this method to initialize
         and start a server.
         """
+        jpserver_extensions = {cls.get_extension_package(): True}
+        find_extensions = cls.load_other_extensions
+        if 'jpserver_extensions' in cls.serverapp_config:
+            jpserver_extensions.update(cls.serverapp_config['jpserver_extensions'])
+            cls.serverapp_config['jpserver_extensions'] = jpserver_extensions
+            find_extensions = False
         serverapp = ServerApp.instance(
-            jpserver_extensions={cls.get_extension_package(): True}, **kwargs)
-        serverapp.aliases.update(cls.aliases)
+            jpserver_extensions=jpserver_extensions, **kwargs)
         serverapp.initialize(
             argv=argv,
             starter_extension=cls.name,
-            find_extensions=cls.load_other_extensions,
+            find_extensions=find_extensions,
         )
         return serverapp
 
@@ -510,7 +515,6 @@ def launch_instance(cls, argv=None, **kwargs):
         # before initializing server to make sure these
         # arguments trigger actions from the extension not the server.
         _preparse_for_stopping_flags(cls, args)
-
         serverapp = cls.initialize_server(argv=args)
 
         # Log if extension is blocking other extensions from loading.

jupyter_server/tests/extension/mockextensions/app.py

@@ -47,6 +47,12 @@ class MockExtensionApp(ExtensionAppJinjaMixin, ExtensionApp):
     mock_trait = Unicode('mock trait', config=True)
     loaded = False
 
+    serverapp_config = {
+        "jpserver_extensions": {
+            "jupyter_server.tests.extension.mockextensions.mock1": True
+        }
+    }
+
     @staticmethod
     def get_extension_package():
         return "jupyter_server.tests.extension.mockextensions"

jupyter_server/tests/extension/test_app.py

@@ -89,3 +89,15 @@ def test_extensionapp_load_config_file(
 def test_browser_open(monkeypatch, jp_environ, config, expected_value):
     serverapp = MockExtensionApp.initialize_server(config=Config(config))
     assert serverapp.open_browser == expected_value
+
+
+
+def test_load_parallel_extensions(monkeypatch, jp_environ):
+    serverapp = MockExtensionApp.initialize_server()
+    exts = serverapp.extension_manager.extensions
+    assert 'jupyter_server.tests.extension.mockextensions.mock1' in exts
+    assert 'jupyter_server.tests.extension.mockextensions' in exts
+
+    exts = serverapp.jpserver_extensions
+    assert exts['jupyter_server.tests.extension.mockextensions.mock1']
+    assert exts['jupyter_server.tests.extension.mockextensions']

setup.cfg

@@ -42,7 +42,7 @@ install_requires =
     terminado>=0.8.3
     prometheus_client
     pywin32>=1.0 ; sys_platform == 'win32'
-    anyio>=2.0.2
+    anyio>=2.0.2,<3
     websocket-client
 
 [options.extras_require]