From 1eefcb4818eb8a4bc9d225541aba6c0043b276c8 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:13:52 +0100
Subject: [PATCH 01/17] Create test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 45 ++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .github/workflows/test_geopandas.yml

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
new file mode 100644
index 0000000000..8aa4fba772
--- /dev/null
+++ b/.github/workflows/test_geopandas.yml
@@ -0,0 +1,45 @@
+name: Run Geopandas tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout Folium
+      uses: actions/checkout@v4
+
+    - name: Setup Micromamba env
+      uses: mamba-org/setup-micromamba@v2
+      with:
+        environment-name: TEST
+        create-args: >-
+          python=3
+          --file requirements.txt
+
+    - name: Install folium from source
+      shell: bash -l {0}
+      run: |
+        python -m pip install -e . --no-deps --force-reinstall
+
+    - name: Checkout Geopandas
+      uses: actions/checkout@v4
+      with:
+        repository: geopandas/geopandas
+        ref: main
+        path: geopandas  # Checkout into a subdirectory
+
+    - name: Install Geopandas dev dependencies
+      run: |
+        cd geopandas
+        pip install -r requirements-dev.txt
+
+    - name: Run Geopandas tests
+      run: |
+        cd geopandas
+        pytest

From 62f5d821e056ff959ab75fba44ddf5799507ac67 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:16:50 +0100
Subject: [PATCH 02/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 8aa4fba772..a4a4c71a12 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -1,4 +1,4 @@
-name: Run Geopandas tests
+name: Geopandas tests
 
 on:
   pull_request:

From c24b13254a691b633604a5c4dfbbcb4d75af0abb Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:18:38 +0100
Subject: [PATCH 03/17] break the geopandas tests

---
 folium/folium.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/folium/folium.py b/folium/folium.py
index 12510ecb43..63d933ab6d 100644
--- a/folium/folium.py
+++ b/folium/folium.py
@@ -243,7 +243,7 @@ def __init__(
         left: Union[str, float] = "0%",
         top: Union[str, float] = "0%",
         position: str = "relative",
-        tiles: Union[str, TileLayer, None] = "OpenStreetMap",
+        tiles: Union[str, TileLayer, None] = "CartDbPositron",
         attr: Optional[str] = None,
         min_zoom: Optional[int] = None,
         max_zoom: Optional[int] = None,

From 191adf0495ca2e2b4776b640c8ea5967c59ecf47 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:08:21 +0100
Subject: [PATCH 04/17] reorder installs

---
 .github/workflows/test_geopandas.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index a4a4c71a12..65254d9c1f 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -22,11 +22,6 @@ jobs:
           python=3
           --file requirements.txt
 
-    - name: Install folium from source
-      shell: bash -l {0}
-      run: |
-        python -m pip install -e . --no-deps --force-reinstall
-
     - name: Checkout Geopandas
       uses: actions/checkout@v4
       with:
@@ -39,6 +34,11 @@ jobs:
         cd geopandas
         pip install -r requirements-dev.txt
 
+    - name: Install folium from source
+      shell: bash -l {0}
+      run: |
+        python -m pip install -e . --no-deps --force-reinstall
+
     - name: Run Geopandas tests
       run: |
         cd geopandas

From 5d564d08daa2e6cdaa1f4c446bb7f89db5f5b33f Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:40:18 +0100
Subject: [PATCH 05/17] only test test_explore.py

---
 .github/workflows/test_geopandas.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 65254d9c1f..0c5027259d 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -31,8 +31,7 @@ jobs:
 
     - name: Install Geopandas dev dependencies
       run: |
-        cd geopandas
-        pip install -r requirements-dev.txt
+        pip install -r geopandas/requirements-dev.txt
 
     - name: Install folium from source
       shell: bash -l {0}
@@ -42,4 +41,4 @@ jobs:
     - name: Run Geopandas tests
       run: |
         cd geopandas
-        pytest
+        pytest geopandas/tests/test_explore.py

From f0fda6f967c0c2d9d4620b9da789a28a0edad43e Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:45:46 +0100
Subject: [PATCH 06/17] try debug paths

---
 .github/workflows/test_geopandas.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 0c5027259d..589515d071 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -13,6 +13,8 @@ jobs:
     steps:
     - name: Checkout Folium
       uses: actions/checkout@v4
+      with:
+        path: main
 
     - name: Setup Micromamba env
       uses: mamba-org/setup-micromamba@v2
@@ -36,9 +38,11 @@ jobs:
     - name: Install folium from source
       shell: bash -l {0}
       run: |
+        pwd && ls -la
         python -m pip install -e . --no-deps --force-reinstall
 
     - name: Run Geopandas tests
       run: |
         cd geopandas
+        pwd && ls -la
         pytest geopandas/tests/test_explore.py

From 337ad2e6fdaa55798cd4b955731c1caeb45c2f28 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:47:14 +0100
Subject: [PATCH 07/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 589515d071..e132a97cea 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Checkout Folium
       uses: actions/checkout@v4
       with:
-        path: main
+        path: folium
 
     - name: Setup Micromamba env
       uses: mamba-org/setup-micromamba@v2
@@ -22,14 +22,12 @@ jobs:
         environment-name: TEST
         create-args: >-
           python=3
-          --file requirements.txt
+          --file folium/requirements.txt
 
     - name: Checkout Geopandas
       uses: actions/checkout@v4
       with:
-        repository: geopandas/geopandas
-        ref: main
-        path: geopandas  # Checkout into a subdirectory
+        path: geopandas
 
     - name: Install Geopandas dev dependencies
       run: |
@@ -38,6 +36,7 @@ jobs:
     - name: Install folium from source
       shell: bash -l {0}
       run: |
+        cd folium
         pwd && ls -la
         python -m pip install -e . --no-deps --force-reinstall
 

From 973cc62d0da0aa59420d10a6ff25a0bf35792679 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:49:43 +0100
Subject: [PATCH 08/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index e132a97cea..71b3eee0a3 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -34,14 +34,11 @@ jobs:
         pip install -r geopandas/requirements-dev.txt
 
     - name: Install folium from source
-      shell: bash -l {0}
       run: |
-        cd folium
         pwd && ls -la
-        python -m pip install -e . --no-deps --force-reinstall
+        python -m pip install -e folium/ --no-deps --force-reinstall
 
     - name: Run Geopandas tests
       run: |
-        cd geopandas
         pwd && ls -la
-        pytest geopandas/tests/test_explore.py
+        pytest geopandas/geopandas/tests/test_explore.py

From 82e6c15bbf0450f01521500cfbcdc6dd6cd338c3 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:51:03 +0100
Subject: [PATCH 09/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 71b3eee0a3..f8ad7dc7dc 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -27,6 +27,7 @@ jobs:
     - name: Checkout Geopandas
       uses: actions/checkout@v4
       with:
+        repository: geopandas/geopandas
         path: geopandas
 
     - name: Install Geopandas dev dependencies
@@ -35,10 +36,12 @@ jobs:
 
     - name: Install folium from source
       run: |
+        cd folium
         pwd && ls -la
-        python -m pip install -e folium/ --no-deps --force-reinstall
+        python -m pip install -e . --no-deps --force-reinstall
 
     - name: Run Geopandas tests
       run: |
+        cd geopandas
         pwd && ls -la
-        pytest geopandas/geopandas/tests/test_explore.py
+        pytest geopandas/tests/test_explore.py

From 5c5fb13c713fcec501f45ad82ac8547af983b0fd Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 15:58:22 +0100
Subject: [PATCH 10/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index f8ad7dc7dc..b6e942f3e3 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -37,11 +37,9 @@ jobs:
     - name: Install folium from source
       run: |
         cd folium
-        pwd && ls -la
         python -m pip install -e . --no-deps --force-reinstall
 
     - name: Run Geopandas tests
       run: |
         cd geopandas
-        pwd && ls -la
-        pytest geopandas/tests/test_explore.py
+        pytest -v -r a -n auto --color=yes geopandas/tests/test_explore.py

From 1b8dc42d81b44fe4c998466672896bc95f2deddc Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:03:39 +0100
Subject: [PATCH 11/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index b6e942f3e3..ecbbf7879a 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -33,6 +33,7 @@ jobs:
     - name: Install Geopandas dev dependencies
       run: |
         pip install -r geopandas/requirements-dev.txt
+        pip install geodatasets
 
     - name: Install folium from source
       run: |

From b9690bd3f310dd2de9af74145aea3430bbe39a65 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:06:19 +0100
Subject: [PATCH 12/17] Revert "break the geopandas tests"

This reverts commit c24b13254a691b633604a5c4dfbbcb4d75af0abb.
---
 folium/folium.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/folium/folium.py b/folium/folium.py
index 63d933ab6d..12510ecb43 100644
--- a/folium/folium.py
+++ b/folium/folium.py
@@ -243,7 +243,7 @@ def __init__(
         left: Union[str, float] = "0%",
         top: Union[str, float] = "0%",
         position: str = "relative",
-        tiles: Union[str, TileLayer, None] = "CartDbPositron",
+        tiles: Union[str, TileLayer, None] = "OpenStreetMap",
         attr: Optional[str] = None,
         min_zoom: Optional[int] = None,
         max_zoom: Optional[int] = None,

From 78a2790233e8ed6c32b0952d823291cf16470f66 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:15:31 +0100
Subject: [PATCH 13/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index ecbbf7879a..bc167a3cbe 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -39,6 +39,8 @@ jobs:
       run: |
         cd folium
         python -m pip install -e . --no-deps --force-reinstall
+        python -c "import os; f='folium/_version.py'; print(open(f).read() if os.path.exists(f) else f'File {f} does not exist')"
+        python -c "import folium; print(folium.__version__)"
 
     - name: Run Geopandas tests
       run: |

From ebcd6dfcfaf89ad94f5111ab1de4814b1e885f36 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:21:19 +0100
Subject: [PATCH 14/17] Update test_geopandas.yml

---
 .github/workflows/test_geopandas.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index bc167a3cbe..816576120b 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -14,6 +14,7 @@ jobs:
     - name: Checkout Folium
       uses: actions/checkout@v4
       with:
+        fetch-depth: 0
         path: folium
 
     - name: Setup Micromamba env

From ff0f09a53d839d2d3e808e47f04351818092a52e Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:47:28 +0100
Subject: [PATCH 15/17] break tests

---
 .github/workflows/test_geopandas.yml | 5 ++---
 folium/folium.py                     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 816576120b..0d8efc553e 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -14,6 +14,7 @@ jobs:
     - name: Checkout Folium
       uses: actions/checkout@v4
       with:
+        # needed to get the correct version number for Folium
         fetch-depth: 0
         path: folium
 
@@ -40,10 +41,8 @@ jobs:
       run: |
         cd folium
         python -m pip install -e . --no-deps --force-reinstall
-        python -c "import os; f='folium/_version.py'; print(open(f).read() if os.path.exists(f) else f'File {f} does not exist')"
-        python -c "import folium; print(folium.__version__)"
 
     - name: Run Geopandas tests
       run: |
         cd geopandas
-        pytest -v -r a -n auto --color=yes geopandas/tests/test_explore.py
+        pytest geopandas/tests/test_explore.py
diff --git a/folium/folium.py b/folium/folium.py
index 12510ecb43..77c0d6e363 100644
--- a/folium/folium.py
+++ b/folium/folium.py
@@ -259,7 +259,7 @@ def __init__(
         no_touch: bool = False,
         disable_3d: bool = False,
         png_enabled: bool = False,
-        zoom_control: Union[bool, str] = True,
+        zoom_control: Union[bool, str] = False,
         font_size: str = "1rem",
         **kwargs: TypeJsonValue,
     ):

From f602678cdd3aac12538c05ce1bf3a367dee96624 Mon Sep 17 00:00:00 2001
From: Conengmo <33519926+Conengmo@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:53:28 +0100
Subject: [PATCH 16/17] restore

---
 .github/workflows/test_geopandas.yml | 2 +-
 folium/folium.py                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index 0d8efc553e..c23e2f9cd0 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -45,4 +45,4 @@ jobs:
     - name: Run Geopandas tests
       run: |
         cd geopandas
-        pytest geopandas/tests/test_explore.py
+        pytest -r a geopandas/tests/test_explore.py
diff --git a/folium/folium.py b/folium/folium.py
index 77c0d6e363..12510ecb43 100644
--- a/folium/folium.py
+++ b/folium/folium.py
@@ -259,7 +259,7 @@ def __init__(
         no_touch: bool = False,
         disable_3d: bool = False,
         png_enabled: bool = False,
-        zoom_control: Union[bool, str] = False,
+        zoom_control: Union[bool, str] = True,
         font_size: str = "1rem",
         **kwargs: TypeJsonValue,
     ):

From 37d2b496bb869f6e6a83e03f1b210a74da7ec3a0 Mon Sep 17 00:00:00 2001
From: Frank Anema <33519926+Conengmo@users.noreply.github.com>
Date: Mon, 17 Mar 2025 11:04:31 +0100
Subject: [PATCH 17/17] Update .github/workflows/test_geopandas.yml

Co-authored-by: Martin Fleischmann <martin@martinfleischmann.net>
---
 .github/workflows/test_geopandas.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test_geopandas.yml b/.github/workflows/test_geopandas.yml
index c23e2f9cd0..816cf2dde7 100644
--- a/.github/workflows/test_geopandas.yml
+++ b/.github/workflows/test_geopandas.yml
@@ -35,7 +35,6 @@ jobs:
     - name: Install Geopandas dev dependencies
       run: |
         pip install -r geopandas/requirements-dev.txt
-        pip install geodatasets
 
     - name: Install folium from source
       run: |