Merge remote-tracking branch 'upstream/main' into update-docs-versioning

Author: Conengmo

.github/workflows/deploy-docs.yml

@@ -17,28 +17,29 @@ permissions:
 jobs:
   run:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash -l {0}
 
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        ref: main
 
     - name: Setup Micromamba env
       uses: mamba-org/setup-micromamba@v2
       with:
         environment-name: TEST
+        init-shell: bash
         create-args: >-
           python=3
           --file requirements.txt
           --file requirements-dev.txt
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: python -m pip install -e . --no-deps --force-reinstall
 
     - name: Build documentation
-      shell: bash -l {0}
       run: |
         set -e
         pushd docs

.github/workflows/test_code.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.9", "3.12"]
         experimental: [false]
         include:
           - python-version: "3.12"

.github/workflows/test_selenium.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ "3.8", "3.12" ]
+        python-version: [ "3.9", "3.12" ]
       fail-fast: false
 
     steps:

folium/plugins/draw.py

@@ -103,7 +103,7 @@ class Draw(JSCSSMixin, MacroElement):
             {{ this._parent.get_name() }}.on('draw:created', function(e) {
                 drawnItems_{{ this.get_name() }}.addLayer(e.layer);
             });
-            
+
             {% if this.export %}
             document.getElementById('export').onclick = function(e) {
                 var data = drawnItems_{{ this.get_name() }}.toGeoJSON();

requirements-dev.txt

@@ -2,6 +2,7 @@ altair>=5.0.0
 cartopy
 check-manifest
 descartes
+fiona
 flake8
 flake8-builtins
 flake8-comprehensions
@@ -10,7 +11,7 @@ flake8-mutable
 flake8-nb>=0.2.5
 geodatasets
 geographiclib
-geopandas
+geopandas>=1
 gpxpy
 ipykernel
 jenkspy

tests/selenium/test_heat_map_selenium.py

@@ -15,7 +15,14 @@ def test_heat_map_with_weights(driver):
     This test will fail in non-headless mode because window size will be different.
 
     """
-    m = folium.Map((0.5, 0.5), zoom_start=8, tiles=None)
+    figure_width, figure_height = 800, 600
+    m = folium.Map(
+        (0.5, 0.5),
+        zoom_start=8,
+        tiles=None,
+        width=figure_width,
+        height=figure_height,
+    )
     HeatMap(
         # make four dots with different weights: 1, 1, 1.5 and 2.
         data=[
@@ -40,6 +47,8 @@ def test_heat_map_with_weights(driver):
     )
     screenshot_bytes = base64.b64decode(canvas_base64)
     screenshot = Image.open(io.BytesIO(screenshot_bytes))
+    # window size is not reliable, so crop to a smaller fixed size
+    screenshot = screenshot.crop((0, 0, figure_width, figure_height))
     path = os.path.dirname(__file__)
     with open(os.path.join(path, "test_heat_map_selenium_screenshot.png"), "rb") as f:
         screenshot_expected = Image.open(f)