Skip to content

Commit

Permalink
Fix builds on Windows and docs errors (#784)
Browse files Browse the repository at this point in the history
  • Loading branch information
choldgraf authored Nov 30, 2023
1 parent 8b40c4e commit 1ae499b
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
sphinx: ["~=5.0","~=6.0","~=7.0"]
include:
- os: windows-latest
python-version: 3.x
# Python 3.12 is broken on windows builds until the following PR is released:
# https://github.com/pradyunsg/sphinx-theme-builder/pull/47
python-version: 3.11
# Windows pulling in dependencies fails
experimental: true
- os: macos-latest
Expand Down
9 changes: 6 additions & 3 deletions docs/content/notebooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,15 @@ import folium
m = folium.Map(
location=[45.372, -121.6972],
zoom_start=12,
tiles='Stamen Terrain'
tiles='Stamen Terrain',
attr="Placeholder attr"
)
folium.Marker(
location=[45.3288, -121.6625],
popup='Mt. Hood Meadows',
icon=folium.Icon(icon='cloud')
icon=folium.Icon(icon='cloud'),
attr="Placeholder attr"
).add_to(m)
folium.Marker(
Expand All @@ -241,7 +243,8 @@ folium.Marker(
folium.Marker(
location=[45.3300, -121.6823],
popup='Some Other Location',
icon=folium.Icon(color='red', icon='info-sign')
icon=folium.Icon(color='red', icon='info-sign'),
attr="Placeholder attr"
).add_to(m)
Expand Down
12 changes: 8 additions & 4 deletions docs/reference/notebooks.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,25 +178,29 @@ import folium
m = folium.Map(
location=[45.372, -121.6972],
zoom_start=12,
tiles='Stamen Terrain'
tiles='Stamen Terrain',
attr="Placeholder attr"
)
folium.Marker(
location=[45.3288, -121.6625],
popup='Mt. Hood Meadows',
icon=folium.Icon(icon='cloud')
icon=folium.Icon(icon='cloud'),
attr="Placeholder attr"
).add_to(m)
folium.Marker(
location=[45.3311, -121.7113],
popup='Timberline Lodge',
icon=folium.Icon(color='green')
icon=folium.Icon(color='green'),
attr="Placeholder attr"
).add_to(m)
folium.Marker(
location=[45.3300, -121.6823],
popup='Some Other Location',
icon=folium.Icon(color='red', icon='info-sign')
icon=folium.Icon(color='red', icon='info-sign'),
attr="Placeholder attr"
).add_to(m)
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# then then deleting compiled files has been found to fix it: `find . -name \*.pyc -delete`

[tox]
envlist = py311-sphinx6
envlist = py310-sphinx6

[testenv]
usedevelop=true
Expand All @@ -30,6 +30,8 @@ commands =
[testenv:docs-{update,clean}]
extras =
doc
deps =
sphinx-theme-builder[cli]
whitelist_externals = rm
commands =
clean: rm -rf docs/_build
Expand Down

0 comments on commit 1ae499b

Please sign in to comment.