Merge pull request #968 from jasongrout/8.0

ipywidgets 8.0 support

Author: martinRenou

.github/workflows/ui-tests.yml

@@ -26,7 +26,7 @@ jobs:
           channels: conda-forge
 
       - name: Mamba install dependencies
-        run: mamba install python=${{ matrix.python-version }} pip nodejs=16 flake8 jupyterlab ipywidgets jupyter-packaging~=0.7.9
+        run: mamba install python=${{ matrix.python-version }} pip nodejs=16 flake8 jupyterlab ipywidgets>=8.0.1 jupyter-packaging~=0.7.9
 
       - name: Install ipyleaflet
         run: pip install .

.gitignore

@@ -28,5 +28,5 @@ docs/test.wkt
 *Untitled*.ipynb
 
 #Galata
-ui-test/playwright-report
-ui-test/test-results
+ui-tests/playwright-report
+ui-tests/test-results

js/package.json

@@ -25,7 +25,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^2 || ^3 || ^4.0.0",
+    "@jupyter-widgets/base": "^2 || ^3 || ^4 || ^5 || ^6",
     "buffer": "^6.0.3",
     "crypto-browserify": "^3.12.0",
     "leaflet": "^1.7.1",

js/src/controls/LayersControl.js

@@ -25,7 +25,6 @@ export class LeafletLayersControlView extends control.LeafletControlView {
    */
 
   initialize(parameters) {
-    super.initialize(parameters);
     super.initialize(parameters);
     this.map_view = this.options.map_view;
   }

js/yarn.lock

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0,==3.*", "setuptools>=40.8.0", "wheel"]
+requires = ["jupyter_packaging~=0.12", "jupyterlab>=3.0.0,==3.*", "setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"

pyproject.toml

@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal=1
-
 [metadata]
 license_file = LICENSE

setup.cfg

@@ -52,9 +52,10 @@
     description='A Jupyter widget for dynamic Leaflet maps',
     long_description=long_description,
     license='MIT License',
+    python_requires = ">=3.7",
     include_package_data=True,
     install_requires=[
-        'ipywidgets>=7.6.0,<8',
+        'ipywidgets>=7.6.0,<9',
         'traittypes>=0.2.1,<3',
         'xyzservices>=2021.8.1',
         'branca>=0.5.0'
@@ -73,7 +74,6 @@
         'Topic :: Multimedia :: Graphics',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',

setup.py

@@ -11,7 +11,7 @@
     "\n",
     "center = [48.265643898808236, 336.7529296875]\n",
     "\n",
-    "m = Map(center=center, zoom=7)\n",
+    "m = Map(center=center, zoom=2)\n",
     "\n",
     "topo_layer = basemap_to_tiles(basemaps.OpenTopoMap)\n",
     "magnifying_glass = MagnifyingGlass(layers=[topo_layer])\n",

ui-tests/notebooks/MagnifyingGlass.ipynb

@@ -11,7 +11,7 @@
     "\n",
     "center = [48.265643898808236, 336.7529296875]\n",
     "\n",
-    "m = Map(center=center, zoom=7)\n",
+    "m = Map(center=center, zoom=2)\n",
     "\n",
     "dark_matter_layer = basemap_to_tiles(basemaps.CartoDB.DarkMatter)\n",
     "m.add(dark_matter_layer)\n",