Depend on jupyterlite-core (#23)

* Require `jupyterlite-core`

* Add upper bound

* Drop tmp wheel

* Update imports

* Update test dep

* Update contributing guide

.github/workflows/test.yml

@@ -11,8 +11,6 @@ on:
 env:
   EXPECT_BUILD: |-
     _output/extensions/@jupyterlite/pyodide-kernel-extension/static/pypi/all.json
-  RTD_WHEEL: |-
-    https://jupyterlite.rtfd.io/en/latest/_static/jupyterlite-0.1.0b18-py3-none-any.whl
 
 jobs:
   build:
@@ -57,8 +55,6 @@ jobs:
         run: |-
           set -eux
           cd dist
-          echo $RTD_WHEEL >> requirements-wheel.txt
-          echo $RTD_WHEEL >> requirements-sdist.txt
           echo "./dist/$(ls *.whl)" >> requirements-wheel.txt
           echo "./dist/$(ls *.tar.gz)" >> requirements-sdist.txt
           cat *.txt
@@ -153,7 +149,7 @@ jobs:
 
       - name: Install test deps
         run: |-
-          python -m pip install jupyterlite-pyodide-kernel[test] jupyterlite[lab] --upgrade-strategy only-if-needed
+          python -m pip install jupyterlite-pyodide-kernel[test] jupyterlite-core[lab] --upgrade-strategy only-if-needed
 
       - name: Check extension
         run: |-

.readthedocs.yml

@@ -13,9 +13,6 @@ build:
       - jlpm --frozen-lockfile
       - jlpm build
       - jlpm dist
-      # TODO: remove
-      - |-
-        python -m pip install --force-reinstall https://jupyterlite.rtfd.io/en/latest/_static/jupyterlite-0.1.0b18-py3-none-any.whl
       # pre-build the lite site to isolate build errors
       - jlpm docs:lite
 

CONTRIBUTING.md

@@ -66,10 +66,6 @@ Serve the `build/` directory as `http://127.0.0.1:8000`, which contains:
 
 ```bash
 python -m pip install -e .[dev,test,docs]
-
-# Temporary while the Pyodide kernel is being migrated to a separate repo
-# TODO: remove
-python -m pip install https://jupyterlite.rtfd.io/en/latest/_static/jupyterlite-0.1.0b18-py3-none-any.whl
 ```
 
 | provides | requires                        | run after changing |

jupyterlite_pyodide_kernel/addons/_base.py

@@ -8,8 +8,8 @@
 import json
 from pathlib import Path
 from typing import Generator, Dict, Any
-from jupyterlite.addons.base import BaseAddon
-from jupyterlite.constants import (
+from jupyterlite_core.addons.base import BaseAddon
+from jupyterlite_core.constants import (
     JUPYTERLITE_IPYNB,
     JUPYTERLITE_JSON,
     UTF8,

jupyterlite_pyodide_kernel/addons/piplite.py

@@ -9,14 +9,14 @@
 from typing import Tuple as _Tuple
 
 import doit.tools
-from jupyterlite.constants import (
+from jupyterlite_core.constants import (
     ALL_JSON,
     JSON_FMT,
     JUPYTERLITE_JSON,
     LAB_EXTENSIONS,
     UTF8,
 )
-from jupyterlite.trait_types import TypedTuple
+from jupyterlite_core.trait_types import TypedTuple
 from traitlets import Unicode
 
 from ._base import _BaseAddon

jupyterlite_pyodide_kernel/addons/pyodide.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 import doit.tools
-from jupyterlite.constants import (
+from jupyterlite_core.constants import (
     JUPYTERLITE_JSON,
 )
 from traitlets import Unicode, default

jupyterlite_pyodide_kernel/app.py

@@ -2,8 +2,8 @@
 from pathlib import Path
 
 from jupyter_core.application import JupyterApp
-from jupyterlite.app import DescribedMixin
-from jupyterlite.trait_types import CPath
+from jupyterlite_core.app import DescribedMixin
+from jupyterlite_core.trait_types import CPath
 
 from ._version import __version__
 from .addons.piplite import list_wheels

jupyterlite_pyodide_kernel/tests/conftest.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 import sys
 import pytest
-from jupyterlite.tests.conftest import (
+from jupyterlite_core.tests.conftest import (
     a_fixture_server,
     an_empty_lite_dir,
     an_unused_port,
@@ -62,8 +62,8 @@ def a_pyodide_tarball():
     unpacked = PYODIDE_FIXTURE.parent / "pyodide/pyodide"
 
     if not unpacked.is_dir():  # pragma: no cover
-        from jupyterlite.addons.base import BaseAddon
-        from jupyterlite.manager import LiteManager
+        from jupyterlite_core.addons.base import BaseAddon
+        from jupyterlite_core.manager import LiteManager
 
         manager = LiteManager()
         BaseAddon(manager=manager).extract_one(PYODIDE_FIXTURE, unpacked.parent)

jupyterlite_pyodide_kernel/tests/test_piplite.py

@@ -5,7 +5,7 @@
 import pytest
 from pytest import mark
 
-from jupyterlite.constants import (
+from jupyterlite_core.constants import (
     JUPYTERLITE_IPYNB,
     JUPYTERLITE_JSON,
     UTF8,

pyproject.toml

@@ -34,8 +34,8 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-    # "jupyterlite>=0.1.0b19",
-    "jupyterlite",
+    # TODO: require 0.1.0b19 as min version
+    "jupyterlite-core >=0.1.0a0,<0.2.0",
     "pkginfo"
 ]