jupyterlab 4.4.0a3__py3-none-any.whl → 4.4.0b1__py3-none-any.whl

jupyterlab/tests/mock_packages/extension/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jupyterlab/mock-extension",
-  "version": "4.4.0-alpha.3",
+  "version": "4.4.0-beta.1",
   "private": true,
   "dependencies": {
-    "@jupyterlab/launcher": "^4.4.0-alpha.3"
+    "@jupyterlab/launcher": "^4.4.0-beta.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.4.0-alpha.3"
+    "@jupyterlab/builder": "^4.4.0-beta.1"
   },
   "jupyterlab": {
     "extension": true,

jupyterlab/tests/mock_packages/interop/consumer/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jupyterlab/mock-consumer",
-  "version": "4.4.0-alpha.3",
+  "version": "4.4.0-beta.1",
   "private": true,
   "dependencies": {
-    "@jupyterlab/mock-token": "^4.4.0-alpha.3"
+    "@jupyterlab/mock-token": "^4.4.0-beta.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.4.0-alpha.3"
+    "@jupyterlab/builder": "^4.4.0-beta.1"
   },
   "jupyterlab": {
     "extension": true,

jupyterlab/tests/mock_packages/interop/provider/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@jupyterlab/mock-provider",
-  "version": "4.4.0-alpha.3",
+  "version": "4.4.0-beta.1",
   "private": true,
   "dependencies": {
-    "@jupyterlab/mock-token": "^4.4.0-alpha.3"
+    "@jupyterlab/mock-token": "^4.4.0-beta.1"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.4.0-alpha.3"
+    "@jupyterlab/builder": "^4.4.0-beta.1"
   },
   "jupyterlab": {
     "extension": true

jupyterlab/tests/mock_packages/interop/token/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/mock-token",
-  "version": "4.4.0-alpha.3",
+  "version": "4.4.0-beta.1",
   "private": true,
   "dependencies": {
     "@lumino/coreutils": "^2.2.0"

jupyterlab/tests/mock_packages/mimeextension/package.json

@@ -3,7 +3,7 @@
   "version": "0.3.0",
   "private": true,
   "dependencies": {
-    "@lumino/widgets": "^2.5.0"
+    "@lumino/widgets": "^2.6.0"
   },
   "jupyterlab": {
     "mimeExtension": true

jupyterlab/tests/mock_packages/service-manager-extension/index.js

@@ -0,0 +1,25 @@
+// Copyright (c) Jupyter Development Team.
+// Distributed under the terms of the Modified BSD License.
+
+import { IDefaultDrive, Drive } from '@jupyterlab/services';
+
+class CustomDrive extends Drive {
+  constructor() {
+    super();
+    console.log('CustomDrive created');
+  }
+}
+
+export default [
+  {
+    id: 'mock-service-manager-extension',
+    provides: IDefaultDrive,
+    autoStart: true,
+    activate: function (application) {
+      // eslint-disable-next-line no-console
+      console.log('service manager mock extension activated');
+      const drive = new CustomDrive();
+      return drive;
+    }
+  }
+];

jupyterlab/tests/mock_packages/service-manager-extension/mock_service_manager_package.py

@@ -0,0 +1,14 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+import json
+import os.path as osp
+
+HERE = osp.abspath(osp.dirname(__file__))
+
+with open(osp.join(HERE, "package.json")) as fid:
+    data = json.load(fid)
+
+
+def _jupyter_labextension_paths():
+    return [{"src": data["jupyterlab"].get("outputDir", "static"), "dest": data["name"]}]

jupyterlab/tests/mock_packages/service-manager-extension/package.json

@@ -0,0 +1,17 @@
+{
+  "name": "@jupyterlab/mock-service-manager-extension",
+  "version": "4.4.0-beta.1",
+  "private": true,
+  "dependencies": {
+    "@jupyterlab/services": "^7.4.0-beta.1"
+  },
+  "devDependencies": {
+    "@jupyterlab/builder": "^4.4.0-beta.1"
+  },
+  "jupyterlab": {
+    "extension": true,
+    "disabledExtensions": [
+      "@jupyterlab/services-extension:default-drive"
+    ]
+  }
+}

jupyterlab/tests/mock_packages/service-manager-extension/setup.py

@@ -0,0 +1,26 @@
+# Copyright (c) Jupyter Development Team.
+# Distributed under the terms of the Modified BSD License.
+
+import json
+import os.path as osp
+from glob import glob
+
+name = "mock_service_manager_package"
+HERE = osp.abspath(osp.dirname(__file__))
+
+with open(osp.join(HERE, "package.json")) as fid:
+    data = json.load(fid)
+
+from setuptools import setup  # noqa
+
+js_name = data["name"]
+
+setup(
+    name=name,
+    version=data["version"],
+    py_modules=[name],
+    data_files=[
+        (f"share/jupyter/labextensions/{js_name}", glob("static/package.json")),
+        (f"share/jupyter/labextensions/{js_name}/static", glob("static/static/*")),
+    ],
+)

jupyterlab/tests/mock_packages/test-hyphens/pyproject.toml

@@ -2,18 +2,66 @@
 # Distributed under the terms of the Modified BSD License.
 
 [build-system]
-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab>=4.0.0a36,<5.0.0"]
-build-backend = "jupyter_packaging.build_api"
+requires = [
+    "hatchling",
+    "jupyterlab>=4.0.0a36,<5.0.0",
+]
+build-backend = "hatchling.build"
 
-[tool.jupyter-packaging.options]
-ensured-targets = ["test_hyphens/labextension/package.json"]
+[project]
+name = "test-hyphens"
+license = "BSD-3-Clause"
+version = "3.0.2"
 
-[tool.jupyter-packaging.builder]
-factory = "jupyter_packaging.npm_builder"
+[tool.hatch.build.targets.wheel.shared-data]
+"test_hyphens/labextension/static" = "share/jupyter/labextensions/test-hyphens/static"
+"test_hyphens/labextension/package.json" = "share/jupyter/labextensions/test-hyphens/package.json"
 
-[tool.jupyter-packaging.build-args]
+[tool.hatch.build.targets.sdist]
+exclude = [
+    ".github",
+]
+
+[tool.hatch.build.hooks.jupyter-builder]
+dependencies = [
+    "hatch-jupyter-builder>=0.9.1",
+]
+build-function = "hatch_jupyter_builder.npm_builder"
+ensured-targets = [
+    "test_hyphens/labextension/package.json",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
+build_dir = "test_hyphens/labextension"
+build_cmd = "build:labextension"
+npm = [
+    "jlpm",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
 build_cmd = "build:labextension"
-npm = ["jlpm"]
+npm = [
+    "jlpm",
+]
+
+[tool.tbump]
+field = [
+    { name = "channel", default = "" },
+    { name = "release", default = "" },
+]
+
+[tool.tbump.version]
+current = "3.0.2"
+regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
+
+[tool.tbump.git]
+message_template = "Bump to {new_version}"
+tag_template = "v{new_version}"
+
+[[tool.tbump.file]]
+src = "pyproject.toml"
+version_template = "version = \"{major}.{minor}.{patch}{channel}{release}\""
 
-[tool.check-manifest]
-ignore = ["test_hyphens/labextension/**", "yarn.lock", ".*", "package-lock.json"]
+[[tool.tbump.file]]
+src = "package.json"
+version_template = "\"version\": \"{major}.{minor}.{patch}{channel}{release}\""

jupyterlab/tests/mock_packages/test-hyphens/setup.py

@@ -1,37 +1,5 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from os import path
-
-from setuptools import setup
-
-version = "3.0.2"
-name = "test_hyphens"
-module_name = "test_hyphens"
-lab_ext_name = "test-hyphens"
-
-HERE = path.abspath(path.dirname(__file__))
-lab_path = path.join(HERE, module_name, "labextension")
-
-data_files_spec = [("share/jupyter/labextensions/" + lab_ext_name, lab_path, "**")]
-
-setup_args = {"name": name, "version": version, "packages": [module_name]}
-
-try:
-    from jupyter_packaging import get_data_files, npm_builder, wrap_installers
-
-    post_develop = npm_builder(build_cmd="build:labextension", build_dir=lab_path, npm=["jlpm"])
-
-    cmdclass = wrap_installers(post_develop=post_develop)
-
-    setup_args.update(
-        {
-            "cmdclass": cmdclass,
-            "data_files": get_data_files(data_files_spec),
-        }
-    )
-except ImportError:
-    pass
-
-
-setup(**setup_args)
+# setup.py shim for use with applications that require it.
+__import__("setuptools").setup()

jupyterlab/tests/mock_packages/test-hyphens-underscore/pyproject.toml

@@ -2,18 +2,66 @@
 # Distributed under the terms of the Modified BSD License.
 
 [build-system]
-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
-build-backend = "jupyter_packaging.build_api"
+requires = [
+    "hatchling",
+    "jupyterlab~=4.0",
+]
+build-backend = "hatchling.build"
 
-[tool.jupyter-packaging.options]
-ensured-targets = ["test_hyphens_underscore/labextension/package.json"]
+[project]
+name = "test-hyphens-underscore"
+license = "BSD-3-Clause"
+version = "3.0.2"
 
-[tool.jupyter-packaging.builder]
-factory = "jupyter_packaging.npm_builder"
+[tool.hatch.build.targets.wheel.shared-data]
+"test_hyphens_underscore/labextension/static" = "share/jupyter/labextensions/test-hyphens-underscore/static"
+"test_hyphens_underscore/labextension/package.json" = "share/jupyter/labextensions/test-hyphens-underscore/package.json"
 
-[tool.jupyter-packaging.build-args]
+[tool.hatch.build.targets.sdist]
+exclude = [
+    ".github",
+]
+
+[tool.hatch.build.hooks.jupyter-builder]
+dependencies = [
+    "hatch-jupyter-builder>=0.9.1",
+]
+build-function = "hatch_jupyter_builder.npm_builder"
+ensured-targets = [
+    "test_hyphens_underscore/labextension/package.json",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
+build_dir = "test_hyphens_underscore/labextension"
+build_cmd = "build:labextension"
+npm = [
+    "jlpm",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
 build_cmd = "build:labextension"
-npm = ["jlpm"]
+npm = [
+    "jlpm",
+]
+
+[tool.tbump]
+field = [
+    { name = "channel", default = "" },
+    { name = "release", default = "" },
+]
+
+[tool.tbump.version]
+current = "3.0.2"
+regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
+
+[tool.tbump.git]
+message_template = "Bump to {new_version}"
+tag_template = "v{new_version}"
+
+[[tool.tbump.file]]
+src = "pyproject.toml"
+version_template = "version = \"{major}.{minor}.{patch}{channel}{release}\""
 
-[tool.check-manifest]
-ignore = ["test_hyphens_underscore/labextension/**", "yarn.lock", ".*", "package-lock.json"]
+[[tool.tbump.file]]
+src = "package.json"
+version_template = "\"version\": \"{major}.{minor}.{patch}{channel}{release}\""

jupyterlab/tests/mock_packages/test-hyphens-underscore/setup.py

@@ -1,37 +1,5 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from os import path
-
-from setuptools import setup
-
-version = "3.0.2"
-name = "test-hyphens-underscore"
-module_name = "test_hyphens_underscore"
-lab_ext_name = "test-hyphens-underscore"
-
-HERE = path.abspath(path.dirname(__file__))
-lab_path = path.join(HERE, module_name, "labextension")
-
-data_files_spec = [("share/jupyter/labextensions/" + lab_ext_name, lab_path, "**")]
-
-setup_args = {"name": name, "version": version, "packages": [module_name]}
-
-
-try:
-    from jupyter_packaging import get_data_files, npm_builder, wrap_installers
-
-    post_develop = npm_builder(build_cmd="build:labextension", build_dir=lab_path, npm=["jlpm"])
-    cmdclass = wrap_installers(post_develop=post_develop)
-
-    setup_args.update(
-        {
-            "cmdclass": cmdclass,
-            "data_files": get_data_files(data_files_spec),
-        }
-    )
-except ImportError:
-    pass
-
-
-setup(**setup_args)
+# setup.py shim for use with applications that require it.
+__import__("setuptools").setup()

jupyterlab/tests/mock_packages/test_no_hyphens/pyproject.toml

@@ -2,18 +2,66 @@
 # Distributed under the terms of the Modified BSD License.
 
 [build-system]
-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=4.0"]
-build-backend = "jupyter_packaging.build_api"
+requires = [
+    "hatchling",
+    "jupyterlab~=4.0",
+]
+build-backend = "hatchling.build"
 
-[tool.jupyter-packaging.options]
-ensured-targets = ["test_no_underscore/labextension/package.json"]
+[project]
+name = "test-no-hyphens"
+license = "BSD-3-Clause"
+version = "3.0.2"
 
-[tool.jupyter-packaging.builder]
-factory = "jupyter_packaging.npm_builder"
+[tool.hatch.build.targets.wheel.shared-data]
+"test_no_hyphens/labextension/package.json" = "share/jupyter/labextensions/test_no_hyphens/package.json"
+"test_no_hyphens/labextension/static" = "share/jupyter/labextensions/test_no_hyphens/static"
 
-[tool.jupyter-packaging.build-args]
+[tool.hatch.build.targets.sdist]
+exclude = [
+    ".github",
+]
+
+[tool.hatch.build.hooks.jupyter-builder]
+dependencies = [
+    "hatch-jupyter-builder>=0.9.1",
+]
+build-function = "hatch_jupyter_builder.npm_builder"
+ensured-targets = [
+    "test_no_hyphens/labextension/package.json",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
+build_dir = "test_no_hyphens/labextension"
+build_cmd = "build:labextension"
+npm = [
+    "jlpm",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
 build_cmd = "build:labextension"
-npm = ["jlpm"]
+npm = [
+    "jlpm",
+]
+
+[tool.tbump]
+field = [
+    { name = "channel", default = "" },
+    { name = "release", default = "" },
+]
+
+[tool.tbump.version]
+current = "3.0.2"
+regex = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)((?P<channel>a|b|rc|.dev)(?P<release>\\d+))?"
+
+[tool.tbump.git]
+message_template = "Bump to {new_version}"
+tag_template = "v{new_version}"
+
+[[tool.tbump.file]]
+src = "pyproject.toml"
+version_template = "version = \"{major}.{minor}.{patch}{channel}{release}\""
 
-[tool.check-manifest]
-ignore = ["test_no_underscore/labextension/**", "yarn.lock", ".*", "package-lock.json"]
+[[tool.tbump.file]]
+src = "package.json"
+version_template = "\"version\": \"{major}.{minor}.{patch}{channel}{release}\""

jupyterlab/tests/mock_packages/test_no_hyphens/setup.py

@@ -1,31 +1,5 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from os import path
-
-from setuptools import setup
-
-version = "3.0.2"
-name = "test_no_hyphens"
-module_name = "test_no_hyphens"
-lab_ext_name = "test_no_hyphens"
-
-HERE = path.abspath(path.dirname(__file__))
-lab_path = path.join(HERE, module_name, "labextension")
-
-data_files_spec = [("share/jupyter/labextensions/" + lab_ext_name, lab_path, "**")]
-
-setup_args = {"name": name, "version": version, "packages": [module_name]}
-
-
-try:
-    from jupyter_packaging import get_data_files, npm_builder, wrap_installers
-
-    post_develop = npm_builder(build_cmd="build:labextension", build_dir=lab_path, npm=["jlpm"])
-    cmdclass = wrap_installers(post_develop=post_develop)
-    setup_args.update({"cmdclass": cmdclass, "data_files": get_data_files(data_files_spec)})
-except ImportError:
-    pass
-
-
-setup(**setup_args)
+# setup.py shim for use with applications that require it.
+__import__("setuptools").setup()

jupyterlab/tests/mock_packages/test_no_hyphens/yarn.lock

@@ -1852,11 +1852,11 @@ __metadata:
   linkType: hard
 
 "nanoid@npm:^3.3.7":
-  version: 3.3.7
-  resolution: "nanoid@npm:3.3.7"
+  version: 3.3.9
+  resolution: "nanoid@npm:3.3.9"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: d36c427e530713e4ac6567d488b489a36582ef89da1d6d4e3b87eded11eb10d7042a877958c6f104929809b2ab0bafa17652b076cdf84324aa75b30b722204f2
+  checksum: 42b1dc3e05d6d4f846e65538dd6fbdf78419d8ef60c531f0faf3264cc90600041ebb53c4276013947e03dc3c9a1ac1fce5bb9e1c3a634db608e95349d7e9d3b6
   languageName: node
   linkType: hard
 

jupyterlab/tests/test_extensions.py

@@ -151,6 +151,74 @@ async def test_ExtensionManager_uninstall():
     assert result.message == "Extension removal not supported."
 
 
+@patch("jupyterlab.extensions.pypi.xmlrpc.client")
+async def test_ExtensionManager_list_extensions_query_sort(mocked_rpcclient):
+    extension_data = [
+        {
+            "name": "jupyterlab-apod",
+            "project_urls": {
+                "Homepage": "https://github.com/jupyterlab/jupyterlab_apod",
+            },
+        },
+        {
+            "name": "jupyterlab-gitlab",
+            "project_urls": {
+                "Homepage": "https://github.com/jupyterlab-contrib/jupyterlab-gitlab/issues",
+            },
+        },
+        {
+            "name": "jupyterlab-git",
+            "project_url": "https://github.com/jupyterlab/jupyterlab-git",
+        },
+        {
+            "name": "jupyterlab-rainbow-brackets",
+            "project_url": "https://github.com/krassowski/jupyterlab-rainbow-brackets",
+        },
+        {"name": "nbdime", "home_page": "https://github.com/jupyter/nbdime"},
+        {
+            "name": "rise",
+            "project_urls": {
+                "Source Code": "https://github.com/jupyterlab-contrib/rise",
+            },
+        },
+    ]
+
+    proxy = Mock(
+        browse=Mock(return_value=[[extension["name"], "1.0.0"] for extension in extension_data]),
+    )
+    mocked_rpcclient.ServerProxy = Mock(return_value=proxy)
+
+    manager = PyPIExtensionManager()
+
+    extensions = {
+        extension["name"]: {"version": "1.0.0", **extension} for extension in extension_data
+    }
+
+    async def mock_pkg_metadata(name, l, b):  # noqa
+        return extensions[name]
+
+    manager._fetch_package_metadata = mock_pkg_metadata
+
+    first_page, pages_count = await manager.list_extensions("", per_page=3)
+    assert [extension.name for extension in first_page] == [
+        # jupyter/jupyterlab
+        "jupyterlab-git",
+        "nbdime",
+        # jupyterlab-contrib
+        "jupyterlab-gitlab",
+    ]
+    assert pages_count == 2
+    second_page, pages_count = await manager.list_extensions("", page=2, per_page=3)
+    assert [extension.name for extension in second_page] == [
+        # jupyterlab-contrib
+        "rise",
+        # other third-party
+        "jupyterlab-rainbow-brackets",
+        # example extensions
+        "jupyterlab-apod",
+    ]
+
+
 @patch("jupyterlab.extensions.pypi.xmlrpc.client")
 async def test_PyPiExtensionManager_list_extensions_query(mocked_rpcclient):
     extension1 = ExtensionPackage(
@@ -240,7 +308,6 @@ async def test_PyPiExtensionManager_list_extensions_query(mocked_rpcclient):
                     "packaging",
                     "pexpect",
                     "coverage ; extra == 'dev'",
-                    "jupyter-packaging (~=0.7.9) ; extra == 'dev'",
                     "jupyterlab (~=3.0) ; extra == 'dev'",
                     "pre-commit ; extra == 'dev'",
                     "pytest ; extra == 'dev'",
@@ -248,7 +315,6 @@ async def test_PyPiExtensionManager_list_extensions_query(mocked_rpcclient):
                     "pytest-cov ; extra == 'dev'",
                     "pytest-tornasync ; extra == 'dev'",
                     "coverage ; extra == 'tests'",
-                    "jupyter-packaging (~=0.7.9) ; extra == 'tests'",
                     "jupyterlab (~=3.0) ; extra == 'tests'",
                     "pre-commit ; extra == 'tests'",
                     "pytest ; extra == 'tests'",

jupyterlab/tests/test_jupyterlab.py

@@ -35,8 +35,10 @@ from jupyterlab.commands import (
     install_extension,
     link_package,
     list_extensions,
+    lock_extension,
     uninstall_extension,
     unlink_package,
+    unlock_extension,
     update_extension,
 )
 from jupyterlab.coreconfig import CoreConfig, _get_default_core_data
@@ -584,6 +586,19 @@ class TestExtension(AppHandlerTest):
         assert check_extension(name, app_options=options)
         assert not check_extension("@jupyterlab/notebook-extension", app_options=options)
 
+    def test_lock_unlock_extension(self):
+        options = AppOptions(app_dir=self.tempdir())
+        assert install_extension(self.mock_extension, app_options=options) is True
+        name = self.pkg_names["extension"]
+        info = get_app_info(app_options=options)
+        assert info["locked"].get(name, False) is False
+        lock_extension(self.pkg_names["extension"], app_options=options)
+        info = get_app_info(app_options=options)
+        assert info["locked"].get(name, False) is True
+        unlock_extension(self.pkg_names["extension"], app_options=options)
+        info = get_app_info(app_options=options)
+        assert info["locked"].get(name, False) is False
+
     @pytest.mark.slow
     def test_build_check(self):
         # Do the initial build.