Skip to content

Commit d5395d3

Browse files
authored
Towards ipyleaflet 0.18.0 (#1147)
* Update yarn.lock and config * Fix missing Stamen basemap * Use xeus-python not pyodide kernel for the jupyterlite deployment * Install ipyleaflet from conda-forge in jlite * Try fixing build * Refactor docs * Try installing ipyleaflet dev version in the jupyterlite docs * Remove annoying silent ImportError * Missing ipyleaflet dependencies in jlite deployment * Missing ipywidgets
1 parent 6bd0cac commit d5395d3

File tree

97 files changed

+8994
-8353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+8994
-8353
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build/
55
*.py[cod]
66
node_modules/
77
*package-lock.json
8+
js/.yarn/
89

910
# Compiled javascript
1011
ipyleaflet/nbextension/

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ build:
66
python: "mambaforge-4.10"
77

88
conda:
9-
environment: docs/environment.yml
9+
environment: docs/build-environment.yml

docs/Makefile

Lines changed: 0 additions & 194 deletions
This file was deleted.
File renamed without changes.

docs/build-environment.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: ipyleaflet-docs
2+
3+
channels:
4+
- conda-forge
5+
6+
dependencies:
7+
- yarn~=1.0
8+
- jupyterlab~=3.6.0
9+
- jupyter-packaging~=0.12
10+
- jupyter-sphinx
11+
- scipy
12+
- netcdf4
13+
- geopandas
14+
- xarray
15+
- branca
16+
- shapely
17+
- pydata-sphinx-theme
18+
- jupyterlite-sphinx
19+
- jupyterlite-xeus-python >=0.9.2,<0.10
20+
- pip:
21+
- ..

docs/source/conf.py renamed to docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
templates_path = ['_templates']
88

9-
jupyterlite_config = "jupyterlite_config.json"
9+
jupyterlite_dir = "."
1010
jupyterlite_contents = [
1111
"../../examples/europe_110.geo.json",
1212
"../../examples/bars.json",

docs/source/controls/draw_control.rst renamed to docs/controls/draw_control.rst

Lines changed: 1 addition & 1 deletion

docs/source/controls/widget_control.rst renamed to docs/controls/widget_control.rst

Lines changed: 1 addition & 1 deletion

docs/environment.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
name: ipyleaflet-docs
2-
1+
name: ipycanvas
32
channels:
4-
- conda-forge
5-
3+
- https://repo.mamba.pm/emscripten-forge
4+
- https://repo.mamba.pm/conda-forge
65
dependencies:
7-
- yarn~=1.0
8-
- jupyterlab~=3.6.0
9-
- jupyter-packaging~=0.12
10-
- jupyter-sphinx
11-
- scipy
12-
- netcdf4
13-
- geopandas
14-
- xarray
6+
- numpy
7+
- ipywidgets
8+
- traittypes
9+
- xyzservices
1510
- branca
16-
- shapely
17-
- pydata-sphinx-theme
18-
1911
- pip:
2012
- ..
21-
- jupyterlite-sphinx
22-
- jupyterlite>=0.1.0b9

docs/source/ipyleaflet.ipynb renamed to docs/ipyleaflet.ipynb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,5 @@
11
{
22
"cells": [
3-
{
4-
"cell_type": "code",
5-
"execution_count": null,
6-
"id": "f2fda73d-1e28-41a8-bf5b-901e3f38866c",
7-
"metadata": {},
8-
"outputs": [],
9-
"source": [
10-
"import piplite\n",
11-
"await piplite.install('ipyleaflet')"
12-
]
13-
},
143
{
154
"cell_type": "code",
165
"execution_count": null,

docs/jupyterlite_config.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

docs/source/layers/circle.rst renamed to docs/layers/circle.rst

Lines changed: 1 addition & 1 deletion

docs/source/layers/circle_marker.rst renamed to docs/layers/circle_marker.rst

Lines changed: 1 addition & 1 deletion

docs/source/layers/layer_group.rst renamed to docs/layers/layer_group.rst

Lines changed: 1 addition & 1 deletion

docs/source/layers/rectangle.rst renamed to docs/layers/rectangle.rst

Lines changed: 1 addition & 1 deletion

docs/source/layers/tile_layer.rst renamed to docs/layers/tile_layer.rst

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)