Skip to content

Commit

Permalink
Updated dependencies.
Browse files Browse the repository at this point in the history
Fixed ts2498 issue.
Deleteing jupyter-server-mathjax.
  • Loading branch information
911432 committed Jun 25, 2024
1 parent 7e93512 commit 04392d3
Show file tree
Hide file tree
Showing 22 changed files with 2,610 additions and 2,910 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-lts-latest

steps:
- name: Checkout
Expand All @@ -25,8 +25,8 @@ jobs:
- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
with:
node_version: '20.x'
python_version: '3.11'
node_version: '20'
python_version: '3.12'

- name: Install dependencies
run: python -m pip install -U pip
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu, windows, macos]
python-version: ['3.8', '3.11']
python-version: ['3.8', '3.12']

steps:
- name: Install Python
Expand All @@ -107,7 +107,7 @@ jobs:
sudo rm -rf $(which node)
- name: Install Built Package (wheel)
if: matrix.python-version == '3.11'
if: matrix.python-version == '3.12'
run: |-
python -m pip install -v -r dist/requirements-wheel.txt
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,5 @@ _pypi.ts
.jupyterlite.doit.db
_output
jupyterlite_pyodide_kernel/tests/fixtures/.pyodide*/
.nx/
env/
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ CHANGELOG.md
# generated
_pypi.ts
**/pypi/all.json
.nx/
env/
4 changes: 2 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: 2

build:
os: ubuntu-22.04
os: ubuntu-lts-latest
tools:
python: '3.11'
python: '3.12'
nodejs: '20'
apt_packages:
- libarchive-dev
Expand Down
3 changes: 1 addition & 2 deletions examples/jupyter_lite_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"output_dir": "../build/docs-app",
"ignore_sys_prefix": ["federated_extensions"],
"federated_extensions": [
"https://files.pythonhosted.org/packages/65/f6/659ca44182c86f57977e946047c339c717745fda9f43b7ac47f274e86553/jupyterlab_widgets-3.0.11-py3-none-any.whl",
"../jupyterlite_pyodide_kernel/labextension"
"https://files.pythonhosted.org/packages/65/f6/659ca44182c86f57977e946047c339c717745fda9f43b7ac47f274e86553/jupyterlab_widgets-3.0.11-py3-none-any.whl"
],
"cache_dir": "../build/.lite-cache"
}
Expand Down
31 changes: 13 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,16 @@
"test": "jlpm test:py"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"eslint": "^8.49.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"lerna": "^7.2.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.1",
"typescript": "~5.2.2",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"lerna": "^8.1.5",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "~5.4.5",
"typescript-eslint": "^7.14.1",
"yarn-berry-deduplicate": "^6.1.1"
},
"prettier": {
Expand All @@ -80,7 +81,9 @@
"dist/",
"docs/",
"node_modules/",
"tests/"
"tests/",
".nx/",
"env/"
],
"extends": [
"eslint:recommended",
Expand Down Expand Up @@ -119,14 +122,6 @@
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-namespace": "off",
"@typescript-eslint/no-use-before-define": "off",
"@typescript-eslint/quotes": [
"error",
"single",
{
"avoidEscape": true,
"allowTemplateLiterals": false
}
],
"curly": [
"error",
"all"
Expand Down
8 changes: 4 additions & 4 deletions packages/pyodide-kernel-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/coreutils": "^6.1.1",
"@jupyterlab/coreutils": "^6.2.2",
"@jupyterlite/contents": "^0.4.0-alpha.3",
"@jupyterlite/kernel": "^0.4.0-alpha.3",
"@jupyterlite/pyodide-kernel": "^0.4.0-beta.0",
"@jupyterlite/server": "^0.4.0-alpha.3"
},
"devDependencies": {
"@jupyterlab/builder": "~4.2.1",
"rimraf": "^5.0.1",
"typescript": "~5.2.2"
"@jupyterlab/builder": "~4.2.2",
"rimraf": "^5.0.7",
"typescript": "~5.4.5"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { IKernel, IKernelSpecs } from '@jupyterlite/kernel';
import { IBroadcastChannelWrapper } from '@jupyterlite/contents';

export * as KERNEL_SETTINGS_SCHEMA from '../schema/kernel.v0.schema.json';
export { default as KERNEL_SETTINGS_SCHEMA } from '../schema/kernel.v0.schema.json';
import KERNEL_ICON_SVG_STR from '../style/img/pyodide.svg';

const KERNEL_ICON_URL = `data:image/svg+xml;base64,${btoa(KERNEL_ICON_SVG_STR)}`;
Expand Down
20 changes: 10 additions & 10 deletions packages/pyodide-kernel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"build:lib": "tsc -b",
"build:prod": "jlpm build",
"build:py": "python scripts/generate-wheels-js.py",
"build:worker": "esbuild --bundle --minify --sourcemap --target=es2019 --format=esm --outfile=lib/coincident.worker.js src/coincident.worker.ts",
"build:worker": "esbuild --bundle --minify --sourcemap --target=es2022 --format=esm --outfile=lib/coincident.worker.js src/coincident.worker.ts",
"dist": "cd ../../dist && npm pack ../packages/pyodide-kernel",
"clean": "jlpm clean:lib && jlpm clean:py",
"clean:all": "jlpm clean",
Expand All @@ -52,21 +52,21 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyterlab/coreutils": "^6.1.1",
"@jupyterlab/coreutils": "^6.2.2",
"@jupyterlite/contents": "^0.4.0-alpha.3",
"@jupyterlite/kernel": "^0.4.0-alpha.3",
"coincident": "^1.2.3"
},
"devDependencies": {
"@babel/core": "^7.22.17",
"@jupyterlab/testutils": "~4.1.1",
"@types/jest": "^29.5.4",
"esbuild": "^0.19.2",
"@babel/core": "^7.24.7",
"@jupyterlab/testutils": "~4.2.0",
"@types/jest": "^29.5.12",
"esbuild": "^0.21.5",
"jest": "^29.7.0",
"pyodide": "0.26.1",
"rimraf": "^5.0.1",
"ts-jest": "^26.3.0",
"typescript": "~5.2.2"
"rimraf": "^5.0.7",
"ts-jest": "^29.1.5",
"typescript": "~5.4.5"
},
"publishConfig": {
"access": "public"
Expand All @@ -75,7 +75,7 @@
"packages": {
"py/pyodide-kernel": "0.4.0b0",
"py/piplite": "0.4.0b0",
"py/ipykernel": "6.9.2",
"py/ipykernel": "6.29.4",
"py/widgetsnbextension3/widgetsnbextension": "3.6.6",
"py/widgetsnbextension4/widgetsnbextension": "4.0.11"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel/py/ipykernel/ipykernel/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""An ipykernel mock"""

__version__ = "6.9.2"
__version__ = "6.29.4"
__all__ = ["Comm", "CommManager", "__version__"]

import re
Expand Down
4 changes: 2 additions & 2 deletions packages/pyodide-kernel/py/ipykernel/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.11"]
requires = ["hatchling>=1.24"]
build-backend = "hatchling.build"

[tool.hatch.version]
Expand All @@ -11,7 +11,7 @@ authors = [
{name = "JupyterLite Contributors"},
]
readme = "README.md"
requires-python = ">=3.10"
requires-python = ">=3.12,<3.13"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
4 changes: 2 additions & 2 deletions packages/pyodide-kernel/py/piplite/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.11"]
requires = ["hatchling>=1.24"]
build-backend = "hatchling.build"

[tool.hatch.version]
Expand All @@ -11,7 +11,7 @@ authors = [
{name = "JupyterLite Contributors"},
]
readme = "README.md"
requires-python = ">=3.11,<3.12"
requires-python = ">=3.12,<3.13"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
4 changes: 2 additions & 2 deletions packages/pyodide-kernel/py/pyodide-kernel/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.11"]
requires = ["hatchling>=1.24"]
build-backend = "hatchling.build"

[tool.hatch.version]
Expand All @@ -11,7 +11,7 @@ authors = [
{name = "JupyterLite Contributors"},
]
readme = "README.md"
requires-python = ">=3.11,<3.12"
requires-python = ">=3.12,<3.13"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.11"]
requires = ["hatchling>=1.24"]
build-backend = "hatchling.build"

[tool.hatch.version]
Expand All @@ -11,7 +11,7 @@ authors = [
{name = "JupyterLite Contributors"},
]
readme = "README.md"
requires-python = ">=3.11,<3.12"
requires-python = ">=3.12,<3.13"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.11"]
requires = ["hatchling>=1.24"]
build-backend = "hatchling.build"

[tool.hatch.version]
Expand All @@ -11,7 +11,7 @@ authors = [
{name = "JupyterLite Contributors"},
]
readme = "README.md"
requires-python = ">=3.11,<3.12"
requires-python = ">=3.12,<3.13"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel/src/_pypi.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// this file is autogenerated from the wheels described in ../package.json
export * as allJSONUrl from '../pypi/all.json';
export * as ipykernelWheelUrl from '../pypi/ipykernel-6.9.2-py3-none-any.whl';
export * as ipykernelWheelUrl from '../pypi/ipykernel-6.29.4-py3-none-any.whl';
export * as pipliteWheelUrl from '../pypi/piplite-0.4.0b0-py3-none-any.whl';
export * as pyodide_kernelWheelUrl from '../pypi/pyodide_kernel-0.4.0b0-py3-none-any.whl';
export * as widgetsnbextensionWheelUrl from '../pypi/widgetsnbextension-3.6.6-py3-none-any.whl';
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel/src/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { IWorkerKernel } from '@jupyterlite/kernel';
/**
* The schema for a Warehouse-like index, as used by piplite.
*/
export * as PIPLITE_INDEX_SCHEMA from '../schema/piplite.v0.schema.json';
export { default as PIPLITE_INDEX_SCHEMA } from '../schema/piplite.v0.schema.json';

/**
* An interface for Pyodide workers.
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../tsconfigbase",
"compilerOptions": {
"lib": ["ES2019", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"],
"lib": ["es2022", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"],
"outDir": "lib",
"resolveJsonModule": false,
"rootDir": "src"
Expand Down
2 changes: 1 addition & 1 deletion packages/pyodide-kernel/tsconfig.test.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../tsconfigbase.test",
"compilerOptions": {
"lib": ["ES2019", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"]
"lib": ["es2022", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"]
},
"include": ["src/**/*", "test/**/*"],
"references": [
Expand Down
14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
requires = [
"hatchling >=1.4.0",
"jupyterlab >=4.2.1,<4.3.0",
"hatchling >=1.24",
"jupyterlab >=4.2.0,<4.3",
]
build-backend = "hatchling.build"

Expand Down Expand Up @@ -59,11 +59,11 @@ jupyterlite-pyodide-kernel-pyodide = "jupyterlite_pyodide_kernel.addons.pyodide:
dev = [
"build",
"hatch",
"jupyterlab >=4.0.7,<4.1.0a0",
"jupyterlab >=4.2.1,<4.3.0",
]

lint = [
"ruff >=0.3.0",
"ruff >=0.4.0",
]

test = [
Expand All @@ -77,10 +77,10 @@ docs = [
"ipywidgets >=8.1.3,<9",
"jupyterlab-language-pack-fr-FR",
"jupyterlab-language-pack-zh-CN",
"jupyterlab-language-pack-ko-KR",
"myst-parser",
"pydata-sphinx-theme",
"sphinx-copybutton",
"jupyter-server-mathjax",
"libarchive-c"
]

Expand Down Expand Up @@ -137,11 +137,11 @@ version_cmd = "python scripts/bump-version.py"

[tool.jupyter-releaser.hooks]
before-bump-version = [
"python -m pip install 'jupyterlab~=4.1.1'",
"python -m pip install 'jupyterlab~=4.2.0'",
"jlpm"
]
before-build-npm = [
"python -m pip install 'jupyterlab~=4.1.1' hatch",
"python -m pip install 'jupyterlab~=4.2.0' hatch",
"python -m pip install -e .[dev]",
"jlpm",
"jlpm build:prod",
Expand Down
4 changes: 2 additions & 2 deletions tsconfigbase.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"esModuleInterop": true,
"incremental": true,
"jsx": "react",
"module": "esnext",
"module": "es2022",
"moduleResolution": "node",
"noEmitOnError": true,
"noImplicitAny": true,
Expand All @@ -17,7 +17,7 @@
"skipLibCheck": true,
"strict": true,
"strictNullChecks": true,
"target": "ES2019",
"target": "es2022",
"types": []
}
}
Loading

0 comments on commit 04392d3

Please sign in to comment.