Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dependency #120

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu, windows, macos]
python-version: ['3.8', '3.11']
python-version: ['3.10', '3.11']

steps:
- name: Install Python
Expand All @@ -112,7 +112,7 @@ jobs:
python -m pip install -v -r dist/requirements-wheel.txt

- name: Install Built Package (sdist)
if: matrix.python-version == '3.8'
if: matrix.python-version == '3.11'
run: |-
python -m pip install -v -r dist/requirements-sdist.txt

Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,11 @@ _pypi.ts
.jupyterlite.doit.db
_output
jupyterlite_pyodide_kernel/tests/fixtures/.pyodide*/
.nx/

#yarn
.yarn/
.yarnrc.yml
yarn.lock
.pnp.cjs
.pnp.loader.mjs
4 changes: 4 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ tasks:
python -m venv ..
source ../bin/activate
python -m pip install -e ".[dev,docs,lint,test]"
npm update npm
yarn set version stable
yarn set version berry
corepack enable
command: |
source ../bin/activate
jlpm
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2

build:
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: '3.11'
nodejs: '20'
Expand Down
23 changes: 1 addition & 22 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1 @@
enableImmutableInstalls: false
enableInlineBuilds: false
enableTelemetry: false
httpTimeout: 60000
nodeLinker: node-modules
npmRegistryServer: https://registry.npmjs.org/
installStatePath: ./build/.cache/yarn/install-state.gz
cacheFolder: ./build/.cache/yarn/cache
# these messages provide no actionable information, and make non-TTY output
# almost unreadable, masking real dependency-related information
# see: https://yarnpkg.com/advanced/error-codes
logFilters:
- code: YN0006 # SOFT_LINK_BUILD
level: discard
- code: YN0007 # MUST_BUILD
level: discard
- code: YN0008 # MUST_REBUILD
level: discard
- code: YN0013 # FETCH_NOT_CACHED
level: discard
- code: YN0019 # UNUSED_CACHE_ENTRY
level: discard
yarnPath: .yarn/releases/yarn-4.3.0.cjs
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ and watch what it does to files on disk and in the terminal log.
### Prerequisites

- `git`
- `python >=3.8`
- `nodejs >=20,<21`
- `python >=3.10`
- `nodejs >=20`

### Setup

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

## Requirements

- `python >=3.8`
- `python >=3.10`

### Compatibility

Expand Down Expand Up @@ -144,8 +144,8 @@ Below is an short overview of getting up and running quickly. Please see the
Ensure the local development environment has:

- `git`
- `nodejs 20`
- `python >=3.8`
- `nodejs >=20`
- `python >=3.10`

### Development Quick Start

Expand Down
26 changes: 9 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"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.13.1",
"@typescript-eslint/parser": "^7.13.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"lerna": "^8.1.3",
"prettier": "^3.3.2",
"rimraf": "^5.0.7",
"typescript": "^5.4.5",
"yarn-berry-deduplicate": "^6.1.1"
},
"prettier": {
Expand Down Expand Up @@ -119,14 +119,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-alpha.2",
"@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
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/worker.js src/worker.ts",
"build:worker": "esbuild --bundle --minify --sourcemap --target=ES2022 --format=esm --outfile=lib/worker.js src/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.2",
"@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.0a2",
"py/piplite": "0.4.0a2",
"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.11,<3.12"
dynamic = ["version", "description"]
classifiers = [
"License :: OSI Approved :: BSD License",
Expand Down
2 changes: 1 addition & 1 deletion 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 Down
2 changes: 1 addition & 1 deletion 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 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 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 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.0a2-py3-none-any.whl';
export * as pyodide_kernelWheelUrl from '../pypi/pyodide_kernel-0.4.0a2-py3-none-any.whl';
export * as widgetsnbextensionWheelUrl from '../pypi/widgetsnbextension-3.6.6-py3-none-any.whl';
Expand Down
4 changes: 2 additions & 2 deletions packages/pyodide-kernel/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"extends": "../../tsconfigbase",
"compilerOptions": {
"lib": ["ES2019", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"],
"lib": ["ES2022", "WebWorker", "ScriptHost", "DOM", "DOM.Iterable"],
"outDir": "lib",
"resolveJsonModule": false,
"resolveJsonModule": true,
"rootDir": "src"
},
"include": ["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
12 changes: 5 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[build-system]
requires = [
"hatchling >=1.4.0",
"hatchling >=1.24",
"jupyterlab >=4.2.1,<4.3.0",
]
build-backend = "hatchling.build"
Expand All @@ -22,16 +22,14 @@ keywords = [
"pyodide",
]
license = { file = "LICENSE" }
requires-python = ">=3.8"
requires-python = ">=3.10"
classifiers = [
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 4",
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
Expand Down Expand Up @@ -59,7 +57,6 @@ jupyterlite-pyodide-kernel-pyodide = "jupyterlite_pyodide_kernel.addons.pyodide:
dev = [
"build",
"hatch",
"jupyterlab >=4.0.7,<4.1.0a0",
]

lint = [
Expand All @@ -77,6 +74,7 @@ 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",
Expand Down Expand Up @@ -137,11 +135,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.2'",
"jlpm"
]
before-build-npm = [
"python -m pip install 'jupyterlab~=4.1.1' hatch",
"python -m pip install 'jupyterlab~=4.2.2' hatch",
"python -m pip install -e .[dev]",
"jlpm",
"jlpm build:prod",
Expand Down
2 changes: 1 addition & 1 deletion tsconfigbase.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"skipLibCheck": true,
"strict": true,
"strictNullChecks": true,
"target": "ES2019",
"target": "ES2022",
"types": []
}
}
Loading