From 22aa1e55bff5953d0ab1098b363e4f06bb765fc3 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Wed, 11 Jun 2025 20:37:27 +0200 Subject: [PATCH 1/5] Update README to point to the extra plugin --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index afabaf11a3..244d7ffdfc 100644 --- a/README.rst +++ b/README.rst @@ -82,3 +82,4 @@ Plugins: - https://github.com/onaci/folium-glify-layer: provide fast webgl rendering for large GeoJSON FeatureCollections - https://github.com/carlosign/Folium.ControlCredits-Plugin: displaying credits in the corner. Display an image/logo, clicking it will expand to show a brief message with credits and links. - https://github.com/JohnyCarrot/folium-geocoder-own-locations: a geocoder that accepts a list of suggestions at creation time. +- https://github.com/iwpnd/folium-vectortilelayer: a tile layer that zooms and stretches beyond the maximum and minimum of the tile provider From 79f548fd53a8366b63dfc6ce3ab2cb1f03c7c08f Mon Sep 17 00:00:00 2001 From: Hans Then Date: Wed, 11 Jun 2025 22:17:31 +0200 Subject: [PATCH 2/5] Try fixing failing CI --- .github/workflows/test_streamlit_folium.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index d821a0c140..3d5eaf0143 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -41,7 +41,8 @@ jobs: - name: Install streamlit_folium dev dependencies shell: bash -l {0} run: | - conda install --file streamlit_folium/tests/requirements.txt + python -m pip install --upgrade pip + pip install -r tests/requirements.txt - name: Install streamlit-folium shell: bash -l {0} From 5e7da4b9b5fcbe708b920ed1da0a1f6a91f3e46c Mon Sep 17 00:00:00 2001 From: Hans Then Date: Wed, 11 Jun 2025 22:20:51 +0200 Subject: [PATCH 3/5] More trial and error --- .github/workflows/test_streamlit_folium.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index 3d5eaf0143..091f51eae8 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -41,6 +41,7 @@ jobs: - name: Install streamlit_folium dev dependencies shell: bash -l {0} run: | + cd streamlit_folium python -m pip install --upgrade pip pip install -r tests/requirements.txt From b8af05f10eb11dcbe01234670c289874cd7dc013 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Thu, 12 Jun 2025 19:28:56 +0200 Subject: [PATCH 4/5] Updated after review comment --- .github/workflows/test_streamlit_folium.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index 091f51eae8..4325d5145e 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -16,14 +16,6 @@ jobs: - 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: Checkout Streamlit Folium uses: actions/checkout@v4 with: @@ -62,7 +54,7 @@ jobs: - name: Install folium from source shell: bash -l {0} run: | - python -m pip install -e . --no-deps --force-reinstall + python -m pip install -e . --force-reinstall - name: Test with pytest and retry flaky tests up to 3 times shell: bash -l {0} From 5904750b5f2d7788e708c7883e77027cc2ff73a7 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Fri, 13 Jun 2025 05:45:48 +0200 Subject: [PATCH 5/5] Update after review comments --- .github/workflows/test_streamlit_folium.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index 4325d5145e..4aaa8c3a6f 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -13,6 +13,11 @@ jobs: runs-on: ubuntu-latest steps: + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.x' + - name: Checkout Folium uses: actions/checkout@v4