Ruff linting

.github/workflows/main.yml

@@ -45,9 +45,7 @@ jobs:
           test -f $CONDA_PREFIX/share/jupyter/labextensions/jupyter-leaflet/package.json
 
       - name: Python Linters
-        uses: psf/black@stable
-        with:
-          jupyter: true
+        run: ruff check --output-format=github .
 
       - name: JS Linters
         run: |

environment-dev.yml

@@ -12,3 +12,4 @@ dependencies:
   - traittypes
   - pandas
   - yarn~=3.0
+  - ruff

examples/CanvasRenderer.ipynb

@@ -39,7 +39,7 @@
     "m = Map(center=(48.1, 17.1), zoom=8, prefer_canvas=True)\n",
     "\n",
     "gdf = geopandas.GeoDataFrame(\n",
-    "    geometry=[shapely.geometry.Point(l) for l in random_locs], crs=\"EPSG:4326\"\n",
+    "    geometry=[shapely.geometry.Point(l) for loc in random_locs], crs=\"EPSG:4326\"\n",
     ")\n",
     "\n",
     "geo_data = GeoData(\n",

examples/Choropleth.ipynb

@@ -166,9 +166,7 @@
     "        State name:\n",
     "        <b>{}\\n</b>\n",
     "        {}\n",
-    "    \"\"\".format(\n",
-    "        id, feature[\"properties\"][\"name\"]\n",
-    "    )\n",
+    "    \"\"\".format(id, feature[\"properties\"][\"name\"])\n",
     "\n",
     "\n",
     "layer.on_hover(update_html)"

examples/DropdownControl.ipynb

@@ -26,7 +26,7 @@
     "        name = item[\"name\"]\n",
     "        basemap = \"basemaps.{}\".format(name)\n",
     "        ee_basemaps[name] = basemap_to_tiles(eval(basemap))\n",
-    "    except:\n",
+    "    except Exception as e:\n",
     "        for sub_item in item:\n",
     "            name = item[sub_item][\"name\"]\n",
     "            basemap = \"basemaps.{}\".format(name)\n",

examples/GeoJson_EU_on_hover.ipynb

@@ -61,9 +61,7 @@
     "        <h4>EU population density</h4>\n",
     "        <h4><b>{}</b></h4>\n",
     "        {} people / mi^2\n",
-    "    \"\"\".format(\n",
-    "        feature[\"properties\"][\"name\"], feature[\"properties\"][\"pop_est\"]\n",
-    "    )\n",
+    "    \"\"\".format(feature[\"properties\"][\"name\"], feature[\"properties\"][\"pop_est\"])\n",
     "\n",
     "\n",
     "geo_json.on_hover(update_html)"

examples/Primitives.ipynb

@@ -30,7 +30,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Map"
+    "## Map\n"
    ]
   },
   {
@@ -94,7 +94,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Marker"
+    "## Marker\n"
    ]
   },
   {
@@ -128,7 +128,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Popup"
+    "## Popup\n"
    ]
   },
   {
@@ -163,14 +163,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Marker Cluster"
+    "## Marker Cluster\n"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "When we have many markers on a map, it is helpful to cluster them together at high zoom levels. First, we create a small grid of markers."
+    "When we have many markers on a map, it is helpful to cluster them together at high zoom levels. First, we create a small grid of markers.\n"
    ]
   },
   {
@@ -179,13 +179,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
+    "from itertools import product\n",
+    "\n",
     "xscale = 5\n",
     "yscale = 10\n",
     "\n",
     "x = [m.center[0] + i * xscale * 0.05 for i in (-1, 0, 1)]\n",
     "y = [m.center[1] + i * yscale * 0.05 for i in (-1, 0, 1)]\n",
     "\n",
-    "from itertools import product\n",
     "\n",
     "locations = product(x, y)\n",
     "markers = [Marker(location=loc) for loc in locations]"
@@ -195,7 +196,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Then we add them all to a `MarkerCluster`, which automatically clusters them at appropriate zoom levels."
+    "Then we add them all to a `MarkerCluster`, which automatically clusters them at appropriate zoom levels.\n"
    ]
   },
   {
@@ -221,7 +222,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Image Overlay"
+    "## Image Overlay\n"
    ]
   },
   {
@@ -265,7 +266,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Polyline"
+    "## Polyline\n"
    ]
   },
   {
@@ -301,7 +302,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Polygon"
+    "## Polygon\n"
    ]
   },
   {
@@ -334,7 +335,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Rectangle"
+    "## Rectangle\n"
    ]
   },
   {
@@ -360,7 +361,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Circle"
+    "## Circle\n"
    ]
   },
   {
@@ -467,7 +468,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## CircleMarker"
+    "## CircleMarker\n"
    ]
   },
   {
@@ -519,7 +520,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "## Multiple Circles"
+    "## Multiple Circles\n"
    ]
   },
   {

ipyleaflet/leaflet.py

@@ -115,7 +115,7 @@ def basemap_to_tiles(basemap, day=yesterday, **kwargs):
         attribution=basemap.get("html_attribution", "")
         or basemap.get("attribution", ""),
         name=basemap.get("name", ""),
-        **kwargs
+        **kwargs,
     )
 
 

pyproject.toml

@@ -2,3 +2,13 @@
 # avoid 3.6 so we don't need the rust buildchain
 requires = ["jupyter_packaging~=0.12", "jupyterlab~=4.0.8", "setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"
+
+[tool.ruff]
+extend-include = ["*.ipynb"]
+
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+]
+ignore = ["E501", "E731"]