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 for webR 0.3.0 #5

Merged
merged 11 commits into from
Mar 22, 2024
2 changes: 0 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module.exports = {
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended",
],
parser: "@typescript-eslint/parser",
parserOptions: {
Expand All @@ -22,6 +21,5 @@ module.exports = {
"@typescript-eslint/no-unsafe-call": "off",
"@typescript-eslint/no-unsafe-return": "off",
"require-jsdoc": "off",
"prettier/prettier": ["error", { singleQuote: true, printWidth: 100 }],
},
};
52 changes: 52 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Build and deploy

on:
push:
branches: [main]
pull_request:
branches: [main]
release:
types: [published]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: '3.11'

- name: Upgrade pip
run: python -m pip install --upgrade pip

- name: Build jupyterlite
run: |
python -m pip install -e ".[dev]"
jupyter lite build

- name: Upload _output/ artifact
if: github.ref == 'refs/heads/main'
uses: actions/upload-pages-artifact@v3
with:
path: "_output/"

deploy_gh_pages:
if: github.ref == 'refs/heads/main'
needs: build

permissions:
pages: write
id-token: write

environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}

runs-on: ubuntu-latest
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ dependencies:
- nodejs=20
# deps
- jupyterlab >=4.0,<5
- jupyterlite-core >=0.2.0a1,<0.3.0
- jupyterlite-core >=0.3.0rc1
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@r-wasm/jupyterlite-webr-kernel",
"version": "0.1.0",
"version": "0.3.0",
"description": "An R kernel for JupyterLite, powered by webR",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -60,13 +60,13 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlite/kernel": "^0.2.0",
"@jupyterlite/server": "^0.2.0",
"@jupyterlite/kernel": "^0.3.0-rc.1",
"@jupyterlite/server": "^0.3.0-rc.1",
"hash.js": "^1.1.7",
"webr": "^0.2.2"
"webr": "^0.3.0"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.8",
"@jupyterlab/builder": "^4.1.5",
"@types/uuid": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^4.8.1",
"@typescript-eslint/parser": "^4.8.1",
Expand Down
12 changes: 8 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5", "hatch-nodejs-version>=0.3.2"]
requires = ["hatchling>=1.5.0", "jupyterlab>=4.1.0,<5", "hatch-nodejs-version>=0.3.2"]
build-backend = "hatchling.build"

[project]
Expand All @@ -21,11 +21,15 @@ classifiers = [
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = ["jupyterlite-core>=0.2.0rc0,<0.3"]
dependencies = ["jupyterlite-core>=0.3.0rc1"]
dynamic = ["version", "description", "authors", "urls", "keywords"]

[project.optional-dependencies]
dev = ["jupyterlab>=4.0.0,<5", "ruff==0.1.5"]
dev = [
"jupyterlab>=4.1.0,<5",
"ruff==0.1.5",
"jupyterlite-pyodide-kernel>=0.3.0a0"
]

[tool.hatch.version]
source = "nodejs"
Expand Down Expand Up @@ -73,7 +77,7 @@ version_cmd = "hatch version"

[tool.jupyter-releaser.hooks]
before-build-npm = [
"python -m pip install 'jupyterlab>=4.0.0,<5'",
"python -m pip install 'jupyterlab>=4.1.0,<5'",
"jlpm",
"jlpm build:prod"
]
Expand Down
Loading