Skip to content

Commit 1ae499b

Browse files
authored
Fix builds on Windows and docs errors (#784)
1 parent 8b40c4e commit 1ae499b

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

.github/workflows/tests.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ jobs:
3535
sphinx: ["~=5.0","~=6.0","~=7.0"]
3636
include:
3737
- os: windows-latest
38-
python-version: 3.x
38+
# Python 3.12 is broken on windows builds until the following PR is released:
39+
# https://github.com/pradyunsg/sphinx-theme-builder/pull/47
40+
python-version: 3.11
3941
# Windows pulling in dependencies fails
4042
experimental: true
4143
- os: macos-latest

docs/content/notebooks.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,15 @@ import folium
223223
m = folium.Map(
224224
location=[45.372, -121.6972],
225225
zoom_start=12,
226-
tiles='Stamen Terrain'
226+
tiles='Stamen Terrain',
227+
attr="Placeholder attr"
227228
)
228229
229230
folium.Marker(
230231
location=[45.3288, -121.6625],
231232
popup='Mt. Hood Meadows',
232-
icon=folium.Icon(icon='cloud')
233+
icon=folium.Icon(icon='cloud'),
234+
attr="Placeholder attr"
233235
).add_to(m)
234236
235237
folium.Marker(
@@ -241,7 +243,8 @@ folium.Marker(
241243
folium.Marker(
242244
location=[45.3300, -121.6823],
243245
popup='Some Other Location',
244-
icon=folium.Icon(color='red', icon='info-sign')
246+
icon=folium.Icon(color='red', icon='info-sign'),
247+
attr="Placeholder attr"
245248
).add_to(m)
246249
247250

docs/reference/notebooks.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -178,25 +178,29 @@ import folium
178178
m = folium.Map(
179179
location=[45.372, -121.6972],
180180
zoom_start=12,
181-
tiles='Stamen Terrain'
181+
tiles='Stamen Terrain',
182+
attr="Placeholder attr"
182183
)
183184
184185
folium.Marker(
185186
location=[45.3288, -121.6625],
186187
popup='Mt. Hood Meadows',
187-
icon=folium.Icon(icon='cloud')
188+
icon=folium.Icon(icon='cloud'),
189+
attr="Placeholder attr"
188190
).add_to(m)
189191
190192
folium.Marker(
191193
location=[45.3311, -121.7113],
192194
popup='Timberline Lodge',
193-
icon=folium.Icon(color='green')
195+
icon=folium.Icon(color='green'),
196+
attr="Placeholder attr"
194197
).add_to(m)
195198
196199
folium.Marker(
197200
location=[45.3300, -121.6823],
198201
popup='Some Other Location',
199-
icon=folium.Icon(color='red', icon='info-sign')
202+
icon=folium.Icon(color='red', icon='info-sign'),
203+
attr="Placeholder attr"
200204
).add_to(m)
201205
202206

tox.ini

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# then then deleting compiled files has been found to fix it: `find . -name \*.pyc -delete`
1212

1313
[tox]
14-
envlist = py311-sphinx6
14+
envlist = py310-sphinx6
1515

1616
[testenv]
1717
usedevelop=true
@@ -30,6 +30,8 @@ commands =
3030
[testenv:docs-{update,clean}]
3131
extras =
3232
doc
33+
deps =
34+
sphinx-theme-builder[cli]
3335
whitelist_externals = rm
3436
commands =
3537
clean: rm -rf docs/_build

0 commit comments

Comments
 (0)