From 4184cae6b98cffd1d409ffd0e25300d3c5f16dea Mon Sep 17 00:00:00 2001 From: Hans Then Date: Sun, 20 Apr 2025 17:10:47 +0200 Subject: [PATCH 1/4] See if this works --- .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 a1fd12b882..6e9ad17e71 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -47,6 +47,7 @@ jobs: - name: Install streamlit_folium dev dependencies shell: bash -l {0} run: | + apt-get install libgdal-dev pip install -r streamlit_folium/tests/requirements.txt - name: Install playwright dependencies From 3f0efd1fff261590d6cdfeb200d89ddf93e91471 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Sun, 20 Apr 2025 17:20:59 +0200 Subject: [PATCH 2/4] Try something else --- .github/workflows/test_streamlit_folium.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index 6e9ad17e71..d79049a8ac 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -47,8 +47,7 @@ jobs: - name: Install streamlit_folium dev dependencies shell: bash -l {0} run: | - apt-get install libgdal-dev - pip install -r streamlit_folium/tests/requirements.txt + conda install --file streamlit_folium/tests/requirements.txt - name: Install playwright dependencies shell: bash -l {0} From da012b2a239beb3aaab6013c1e8993ad57faca02 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Sun, 20 Apr 2025 17:26:10 +0200 Subject: [PATCH 3/4] Change order of install --- .github/workflows/test_streamlit_folium.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_streamlit_folium.yml b/.github/workflows/test_streamlit_folium.yml index d79049a8ac..206279fd44 100644 --- a/.github/workflows/test_streamlit_folium.yml +++ b/.github/workflows/test_streamlit_folium.yml @@ -38,16 +38,16 @@ jobs: npm install npm run build - - name: Install streamlit-folium + - name: Install streamlit_folium dev dependencies shell: bash -l {0} run: | - cd streamlit_folium - pip install -e . + conda install --file streamlit_folium/tests/requirements.txt - - name: Install streamlit_folium dev dependencies + - name: Install streamlit-folium shell: bash -l {0} run: | - conda install --file streamlit_folium/tests/requirements.txt + cd streamlit_folium + pip install -e . - name: Install playwright dependencies shell: bash -l {0} From 49e7728480e4312de3fdf639372ffcf71248ab32 Mon Sep 17 00:00:00 2001 From: Hans Then Date: Mon, 21 Apr 2025 18:01:51 +0200 Subject: [PATCH 4/4] Fix awesome markers broken by tojavascript --- folium/features.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/folium/features.py b/folium/features.py index 1c18f426db..8019bb9137 100644 --- a/folium/features.py +++ b/folium/features.py @@ -570,9 +570,9 @@ class GeoJson(Layer): {%- if this.marker %} function {{ this.get_name() }}_pointToLayer(feature, latlng) { - var opts = {{ this.marker.options | tojson | safe }}; + var opts = {{ this.marker.options | tojavascript }}; {% if this.marker._name == 'Marker' and this.marker.icon %} - const iconOptions = {{ this.marker.icon.options | tojson | safe }} + const iconOptions = {{ this.marker.icon.options | tojavascript }} const iconRootAlias = L{%- if this.marker.icon._name == "Icon" %}.AwesomeMarkers{%- endif %} opts.icon = new iconRootAlias.{{ this.marker.icon._name }}(iconOptions) {% endif %}