Skip to content

Commit

Permalink
update leaflet-splitmap to v1.0.3 (#1135)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
oxidase authored Sep 8, 2023
1 parent ddeab67 commit 8cdf572
Show file tree
Hide file tree
Showing 8 changed files with 1,351 additions and 2,756 deletions.
6 changes: 3 additions & 3 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ channels:
- conda-forge

dependencies:
- yarn
- jupyterlab
- jupyter-packaging
- yarn~=1.0
- jupyterlab~=3.6.0
- jupyter-packaging~=0.12
- jupyter-sphinx
- scipy
- netcdf4
Expand Down
4 changes: 2 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ dependencies:
- pip
- wheel
- flake8
- jupyterlab
- jupyterlab~=3.6.0
- jupyter-packaging~=0.12
- ipywidgets
- xyzservices
- branca
- traittypes
- jupyter-packaging~=0.7.9
- pandas
4 changes: 2 additions & 2 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"leaflet-measure": "^3.1.0",
"leaflet-rotatedmarker": "^0.2.0",
"leaflet-search": "2.9.8",
"leaflet-splitmap": "^1.0.1",
"leaflet-splitmap": "^1.0.3",
"leaflet-transform": "^1.0.3",
"leaflet-velocity": "^1.2.4",
"leaflet.awesome-markers": "^2.0.5",
Expand All @@ -50,7 +50,7 @@
"stream-browserify": "^3.0.0"
},
"devDependencies": {
"@jupyterlab/builder": "^3.0.0",
"@jupyterlab/builder": "^3.6.0",
"css-loader": "^3.4.2",
"eslint": "^8.23.1",
"eslint-config-prettier": "^8.5.0",
Expand Down
4,089 changes: 1,342 additions & 2,747 deletions js/yarn.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build-system]
# avoid 3.6 so we don't need the rust buildchain
requires = ["jupyter_packaging~=0.12", "jupyterlab>=3.0.0,<3.6", "setuptools>=40.8.0", "wheel"]
requires = ["jupyter_packaging~=0.12", "jupyterlab~=3.6.0", "setuptools>=40.8.0", "wheel"]
build-backend = "setuptools.build_meta"
2 changes: 1 addition & 1 deletion ui-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "ipyleaflet UI Tests",
"private": true,
"scripts": {
"start": "jupyter lab --config ./jupyter_server_config.py",
"start": "jupyter labextension disable '@jupyterlab/apputils-extension:announcements' && jupyter lab --config ./jupyter_server_config.py",
"start:detached": "yarn run start&",
"clean": "rimraf tests/notebooks/.ipynb_checkpoints && rimraf test-output",
"test": "yarn run clean && playwright test",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8cdf572

Please sign in to comment.