Skip to content

Commit 8cdf572

Browse files
authored
update leaflet-splitmap to v1.0.3 (#1135)
* update leaflet-splitmap to v1.0.3 * pin jupyterlab in conda similar to pyproject.toml * update Subitems UI expectations * remove "<3.6" requirement for jupyterlab * pin jupyterlab to 3.6.x * pin yarn to v1.x in ipyleaflet-docs environment * disable notifications in ui-tests
1 parent ddeab67 commit 8cdf572

File tree

8 files changed

+1351
-2756
lines changed

8 files changed

+1351
-2756
lines changed

docs/environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ channels:
44
- conda-forge
55

66
dependencies:
7-
- yarn
8-
- jupyterlab
9-
- jupyter-packaging
7+
- yarn~=1.0
8+
- jupyterlab~=3.6.0
9+
- jupyter-packaging~=0.12
1010
- jupyter-sphinx
1111
- scipy
1212
- netcdf4

environment-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dependencies:
55
- pip
66
- wheel
77
- flake8
8-
- jupyterlab
8+
- jupyterlab~=3.6.0
9+
- jupyter-packaging~=0.12
910
- ipywidgets
1011
- xyzservices
1112
- branca
1213
- traittypes
13-
- jupyter-packaging~=0.7.9
1414
- pandas

js/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"leaflet-measure": "^3.1.0",
3939
"leaflet-rotatedmarker": "^0.2.0",
4040
"leaflet-search": "2.9.8",
41-
"leaflet-splitmap": "^1.0.1",
41+
"leaflet-splitmap": "^1.0.3",
4242
"leaflet-transform": "^1.0.3",
4343
"leaflet-velocity": "^1.2.4",
4444
"leaflet.awesome-markers": "^2.0.5",
@@ -50,7 +50,7 @@
5050
"stream-browserify": "^3.0.0"
5151
},
5252
"devDependencies": {
53-
"@jupyterlab/builder": "^3.0.0",
53+
"@jupyterlab/builder": "^3.6.0",
5454
"css-loader": "^3.4.2",
5555
"eslint": "^8.23.1",
5656
"eslint-config-prettier": "^8.5.0",

js/yarn.lock

Lines changed: 1342 additions & 2747 deletions
Large diffs are not rendered by default.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[build-system]
22
# avoid 3.6 so we don't need the rust buildchain
3-
requires = ["jupyter_packaging~=0.12", "jupyterlab>=3.0.0,<3.6", "setuptools>=40.8.0", "wheel"]
3+
requires = ["jupyter_packaging~=0.12", "jupyterlab~=3.6.0", "setuptools>=40.8.0", "wheel"]
44
build-backend = "setuptools.build_meta"

ui-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "ipyleaflet UI Tests",
55
"private": true,
66
"scripts": {
7-
"start": "jupyter lab --config ./jupyter_server_config.py",
7+
"start": "jupyter labextension disable '@jupyterlab/apputils-extension:announcements' && jupyter lab --config ./jupyter_server_config.py",
88
"start:detached": "yarn run start&",
99
"clean": "rimraf tests/notebooks/.ipynb_checkpoints && rimraf test-output",
1010
"test": "yarn run clean && playwright test",
48.3 KB
Loading
48.5 KB
Loading

0 commit comments

Comments
 (0)