Skip to content

Commit 7259072

Browse files
authored
Merge pull request #13 from itaistopel/feature/jupyterlab_2_x_support
Jupyter 2.0.1 support
2 parents ca55830 + f9eb3a6 commit 7259072

File tree

8 files changed

+745
-613
lines changed

8 files changed

+745
-613
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Quickly open a file in JupyterLab by typing part of its name
99
## Compatibility
1010

1111
- Python >=3.7.x
12-
- JupyterLab >=1.0,<2.0
12+
- JupyterLab >=2.0,<3.0
1313
- Jupyter Notebook >=6.0,<7.0
1414
- Notebook server configurations where notebook documents and other files reside on the local
1515
filesystem (which is the the notebook server default)
@@ -86,6 +86,12 @@ The project includes a Makefile which makes setting up a development environment
8686
easy. You must also install the latest Node LTS release as a prerequisite.
8787

8888
```
89+
# Install poetry
90+
make poetry
91+
92+
# Refresh the poetry.lock file if upgrading jupyterlab in pyproject.toml
93+
poetry lock
94+
8995
# Create a dev environment
9096
make venv
9197
@@ -101,6 +107,7 @@ make watch-src
101107
102108
# In a second terminal, watch for rebuilt extension packages and rebuild
103109
# jupyterlab to include them
110+
make shell
104111
make watch-lab
105112
```
106113

binder/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jupyterlab>=1.0,<2.0a
1+
jupyterlab>=2.0,<3.0a
22
jupyterlab-quickopen
33
notebook>=6.0,<7.0a

package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,19 @@
3131
"watch": "tsc -w"
3232
},
3333
"dependencies": {
34-
"@jupyterlab/application": "^1.0.0",
35-
"@jupyterlab/apputils": "^1.0.0",
36-
"@jupyterlab/coreutils": "^3.0.0",
37-
"@jupyterlab/docmanager": "^1.0.0",
38-
"@jupyterlab/filebrowser": "^1.0.1",
39-
"@jupyterlab/services": "^4.0.0",
40-
"@phosphor/messaging": "^1.2.3",
41-
"@phosphor/widgets": "^1.8.1"
34+
"@jupyterlab/application": "^2.0.2",
35+
"@jupyterlab/apputils": "^2.0.2",
36+
"@jupyterlab/coreutils": "^4.0.2",
37+
"@jupyterlab/settingregistry": "^2.0.1",
38+
"@jupyterlab/docmanager": "^2.0.2",
39+
"@jupyterlab/filebrowser": "^2.0.2",
40+
"@jupyterlab/services": "^5.0.2",
41+
"@lumino/messaging": "^1.3.3",
42+
"@lumino/widgets": "^1.11.1"
4243
},
4344
"devDependencies": {
4445
"rimraf": "^2.6.1",
45-
"typescript": "~3.5.2"
46+
"typescript": "~3.7.2"
4647
},
4748
"jupyterlab": {
4849
"extension": true,

poetry.lock

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ version = "0.4.1"
44
description = "Quickly open a file in JupyterLab by typing part of its name"
55
authors = ["Peter Parente <[email protected]>"]
66

7-
87
[tool.poetry.dependencies]
98
python = ">=3.7"
10-
jupyterlab = ">=1.0,<2.0a"
9+
jupyterlab = ">=2.0,<3.0a"
1110
notebook = ">=6.0,<7.0a"
1211

1312
[tool.poetry.dev-dependencies]

src/index.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
import { ILabShell, JupyterFrontEnd, JupyterFrontEndPlugin } from "@jupyterlab/application";
22
import { ICommandPalette } from "@jupyterlab/apputils";
3-
import { ISettingRegistry, URLExt, PathExt } from "@jupyterlab/coreutils";
3+
import { URLExt, PathExt } from "@jupyterlab/coreutils";
44
import { IDocumentManager } from "@jupyterlab/docmanager";
55
import { ServerConnection } from "@jupyterlab/services";
6+
import { ISettingRegistry } from "@jupyterlab/settingregistry";
67
import { FileBrowser, IFileBrowserFactory } from '@jupyterlab/filebrowser';
7-
import { CommandRegistry } from "@phosphor/commands";
8-
import { ReadonlyJSONObject } from "@phosphor/coreutils";
9-
import { Message } from "@phosphor/messaging";
10-
import { ISignal, Signal } from "@phosphor/signaling";
11-
import { CommandPalette } from "@phosphor/widgets";
8+
import { CommandRegistry } from "@lumino/commands";
9+
import { ReadonlyJSONObject } from "@lumino/coreutils";
10+
import { Message } from "@lumino/messaging";
11+
import { ISignal, Signal } from "@lumino/signaling";
12+
import { CommandPalette } from "@lumino/widgets";
1213
import "../style/index.css";
1314

1415
/** Structure of the JSON response from the server */

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"compilerOptions": {
3+
"allowSyntheticDefaultImports": true,
34
"declaration": true,
45
"lib": ["es2017", "dom"],
56
"module": "commonjs",

0 commit comments

Comments
 (0)