Skip to content

Commit 932a697

Browse files
authored
Merge pull request #2210 from python-visualization/dependabot/github_actions/github-actions-674967a53d
Bump actions/upload-artifact from 6 to 7 in the github-actions group
2 parents e7ffb71 + 5931c8a commit 932a697

File tree

10 files changed

+16
-26
lines changed

10 files changed

+16
-26
lines changed

.github/workflows/save_versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
3737
- name: Save versions.txt
3838
if: always()
39-
uses: actions/upload-artifact@v6
39+
uses: actions/upload-artifact@v7
4040
with:
4141
name: versions.txt
4242
path: /tmp/versions.txt

.github/workflows/test_code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
4848
- name: Upload coverage
4949
if: always()
50-
uses: actions/upload-artifact@v6
50+
uses: actions/upload-artifact@v7
5151
with:
5252
name: coverage-test-code-${{ matrix.os }}-${{ matrix.python-version }}
5353
path: .coverage*

.github/workflows/test_geopandas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
5555
- name: Upload coverage
5656
if: always()
57-
uses: actions/upload-artifact@v6
57+
uses: actions/upload-artifact@v7
5858
with:
5959
name: coverage-test-geopandas
6060
path: |

.github/workflows/test_latest_branca.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
3939
- name: Upload coverage
4040
if: always()
41-
uses: actions/upload-artifact@v6
41+
uses: actions/upload-artifact@v7
4242
with:
4343
name: coverage-test-branca
4444
path: |

.github/workflows/test_selenium.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Upload coverage
4141
if: always()
42-
uses: actions/upload-artifact@v6
42+
uses: actions/upload-artifact@v7
4343
with:
4444
name: coverage-test-selenium-${{ matrix.python-version }}
4545
path: |

.github/workflows/test_snapshots.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
- name: Upload screenshots
4949
if: failure()
50-
uses: actions/upload-artifact@v6
50+
uses: actions/upload-artifact@v7
5151
with:
5252
name: screenshots
5353
path: |
@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: Upload coverage
5858
if: always()
59-
uses: actions/upload-artifact@v6
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: coverage-test-snapshots
6262
path: |

.github/workflows/test_streamlit_folium.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575

7676
- name: Upload coverage
7777
if: always()
78-
uses: actions/upload-artifact@v6
78+
uses: actions/upload-artifact@v7
7979
with:
8080
name: coverage-test-streamlit-folium
8181
path: |

folium/elements.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,18 @@ class EventHandler(MacroElement):
101101
>>>
102102
>>> g = folium.GeoJson(geo_json_data).add_to(m)
103103
>>>
104-
>>> highlight = JsCode(
105-
... """
104+
>>> highlight = JsCode("""
106105
... function highlight(e) {
107106
... e.target.original_color = e.layer.options.color;
108107
... e.target.setStyle({ color: "green" });
109108
... }
110-
... """
111-
... )
109+
... """)
112110
>>>
113-
>>> reset = JsCode(
114-
... """
111+
>>> reset = JsCode("""
115112
... function reset(e) {
116113
... e.target.setStyle({ color: e.target.original_color });
117114
... }
118-
... """
119-
... )
115+
... """)
120116
>>>
121117
>>> g.add_child(EventHandler("mouseover", highlight))
122118
>>> g.add_child(EventHandler("mouseout", reset))

folium/plugins/draw.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,11 @@ class Draw(JSCSSMixin, MacroElement):
4242
... position="topleft",
4343
... draw_options={"polyline": {"allowIntersection": False}},
4444
... edit_options={"poly": {"allowIntersection": False}},
45-
... on={
46-
... "click": JsCode(
47-
... """
45+
... on={"click": JsCode("""
4846
... function(event) {
4947
... alert(JSON.stringify(this.toGeoJSON()));
5048
... }
51-
... """
52-
... )
53-
... },
49+
... """)},
5450
... ).add_to(m)
5551
5652
For more info please check

folium/plugins/timeline.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class Timeline(GeoJson):
5353
5454
>>> timeline = Timeline(
5555
... data,
56-
... get_interval=JsCode(
57-
... '''
56+
... get_interval=JsCode('''
5857
... function (quake) {
5958
... // earthquake data only has a time, so we\'ll use that as a "start"
6059
... // and the "end" will be that + some value based on magnitude
@@ -65,8 +64,7 @@ class Timeline(GeoJson):
6564
... end: quake.properties.time + quake.properties.mag * 1800000,
6665
... };
6766
... };
68-
... '''
69-
... ),
67+
... '''),
7068
... ).add_to(m)
7169
>>> TimelineSlider(
7270
... auto_play=False,

0 commit comments

Comments
 (0)