Skip to content

Commit

Permalink
Port to jupyterlab 4
Browse files Browse the repository at this point in the history
  • Loading branch information
peytondmurray committed Apr 4, 2023
1 parent 31e83c4 commit ae2445f
Show file tree
Hide file tree
Showing 9 changed files with 5,894 additions and 6,464 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '18.x'
- name: Install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.11'
architecture: 'x64'
- name: Install dependencies
run: python -m pip install jupyterlab
run: python -m pip install jupyterlab==4.0.0a37
- name: Build the extension
run: |
jlpm
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,4 @@ dmypy.json

# OSX files
.DS_Store
.yarn
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## [2.0.0](https://github.com/deshaw/jupyterlab-limit-output/compare/v1.0.1...v2.0.0) (2023-04-04)

### Changed

- Ported to JupyterLab 4

## [1.0.1](https://github.com/deshaw/jupyterlab-limit-output/compare/v1.0.0...v1.0.1) (2023-03-27)

### Fixed
Expand Down
40 changes: 20 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jupyterlab-limit-output",
"version": "1.0.1",
"version": "2.0.0",
"description": "Limit output text mime-renders",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -54,39 +54,39 @@
"tslint": "tslint --fix -c tslint.json --project tsconfig.json '**/*{.ts,.tsx}'",
"watch": "run-p watch:src watch:labextension",
"watch:labextension": "jupyter-labextension watch .",
"watch:src": "tsc -w"
"watch:src": "tsc -w --sourceMap"
},
"dependencies": {
"@jupyterlab/application": "^3.0.0",
"@jupyterlab/apputils": "^3.0.0",
"@jupyterlab/settingregistry": "^3.0.0",
"@jupyterlab/rendermime": "^3.0.0"
"@jupyterlab/application": "^4.0.0-alpha.22",
"@jupyterlab/apputils": "^4.0.0-alpha.22",
"@jupyterlab/rendermime": "^4.0.0-alpha.22",
"@jupyterlab/settingregistry": "^4.0.0-alpha.22"
},
"husky": {
"hooks": {
"pre-commit": "npm run lint && npm run test"
}
},
"devDependencies": {
"@jupyterlab/builder": "^3.1.12",
"@types/chai": "^4.2.22",
"@types/mocha": "^9.0.0",
"@typescript-eslint/eslint-plugin": "^4.32.0",
"@typescript-eslint/parser": "^4.32.0",
"chai": "^4.3.4",
"@jupyterlab/builder": "^4.0.0-alpha.22",
"@types/chai": "^4.3.4",
"@types/mocha": "^10.0.1",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"chai": "^4.3.7",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"husky": "^4.2.3",
"mocha": "^9.1.2",
"eslint-config-prettier": "^8.7.0",
"eslint-plugin-prettier": "^4.2.1",
"husky": "^8.0.3",
"mocha": "^10.2.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.4.1",
"rimraf": "^3.0.2",
"ts-mocha": "^8.0.0",
"prettier": "^2.8.7",
"rimraf": "^4.4.1",
"ts-mocha": "^10.0.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-plugin-prettier": "^2.3.0",
"typescript": "~4.1.3"
"typescript": "~5.0.2"
},
"styleModule": "style/index.js"
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["jupyter_packaging~=0.9,<2", "jupyterlab~=3.0"]
requires = ["jupyter_packaging~=0.10,<2", "jupyterlab==4.0.0a37"]
build-backend = "jupyter_packaging.build_api"

[tool.jupyter-packaging.builder]
Expand Down
12 changes: 8 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
long_description=long_description,
long_description_content_type="text/markdown",
packages=setuptools.find_packages(),
install_requires=["jupyter_server>=1.6,<2"],
install_requires=["jupyter_server>=2.0.1,<3"],
zip_safe=False,
include_package_data=True,
python_requires=">=3.6",
python_requires=">=3.7",
platforms="Linux, Mac OS X, Windows",
keywords=["Jupyter", "JupyterLab", "JupyterLab3"],
keywords=["Jupyter", "JupyterLab", "JupyterLab4"],
classifiers=[
"License :: OSI Approved :: BSD License",
"Programming Language :: Python",
Expand All @@ -55,12 +55,16 @@
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 4",
"Framework :: Jupyter :: JupyterLab :: Extensions",
"Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
],
)


post_develop = npm_builder(
build_cmd="install:extension", source_dir="src", build_dir=lab_path
build_cmd="install:extension", source_dir="src", build_dir=lab_path, npm="jlpm"
)
setup_args["cmdclass"] = wrap_installers(
post_develop=post_develop, ensured_targets=ensured_targets
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"rootDir": "src",
"strict": true,
"strictNullChecks": false,
"target": "es2017",
"target": "es2018",
"types": []
},
"include": ["src/*"]
Expand Down
Loading

0 comments on commit ae2445f

Please sign in to comment.