Skip to content

Replace githack.com CDN with jsdelivr.com #1337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 25, 2020
Merged

Replace githack.com CDN with jsdelivr.com #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion folium/folium.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
('awesome_markers_css',
'https://cdnjs.cloudflare.com/ajax/libs/Leaflet.awesome-markers/2.0.2/leaflet.awesome-markers.css'), # noqa
('awesome_rotate_css',
'https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/leaflet.awesome.rotate.css'), # noqa
'https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/leaflet.awesome.rotate.min.css'), # noqa
]


Expand Down
4 changes: 2 additions & 2 deletions folium/plugins/beautify_icon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

_default_js = [
('beautify_icon_js',
'https://rawcdn.githack.com/marslan390/BeautifyMarker/master/leaflet-beautify-marker-icon.js')
'https://cdn.jsdelivr.net/gh/marslan390/BeautifyMarker/leaflet-beautify-marker-icon.min.js')
]

_default_css = [
('beautify_icon_css',
'https://rawcdn.githack.com/marslan390/BeautifyMarker/master/leaflet-beautify-marker-icon.css')
'https://cdn.jsdelivr.net/gh/marslan390/BeautifyMarker/leaflet-beautify-marker-icon.min.css')
]


Expand Down
2 changes: 1 addition & 1 deletion folium/plugins/dual_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

_default_js = [
('Leaflet.Sync',
'https://rawcdn.githack.com/jieter/Leaflet.Sync/master/L.Map.Sync.js')
'https://cdn.jsdelivr.net/gh/jieter/Leaflet.Sync/L.Map.Sync.min.js')
]


Expand Down
11 changes: 6 additions & 5 deletions folium/plugins/heat_map_withtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@

_default_js = [
('iso8601',
'https://rawcdn.githack.com/nezasa/iso8601-js-period/master/iso8601.min.js'),
'https://cdn.jsdelivr.net/npm/iso8601-js-period@0.2.1/iso8601.min.js'),
('leaflet.timedimension.min.js',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js'),
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.min.js'),
('heatmap.min.js',
'https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/pa7_hm.min.js'),
'https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/pa7_hm.min.js'),
('leaflet-heatmap.js',
'https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/pa7_leaflet_hm.min.js'),
'https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/pa7_leaflet_hm.min.js'),
]


_default_css = [
('leaflet.timedimension.control.min.css',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css')
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.control.css')
]


Expand Down
4 changes: 2 additions & 2 deletions folium/plugins/measure_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

_default_js = [
('leaflet_measure_js',
'https://rawcdn.githack.com/ljagis/leaflet-measure/2.1.7/dist/leaflet-measure.js')
'https://cdn.jsdelivr.net/gh/ljagis/leaflet-measure@2.1.7/dist/leaflet-measure.min.js')
]

_default_css = [
('leaflet_measure_css',
'https://rawcdn.githack.com/ljagis/leaflet-measure/2.1.7/dist/leaflet-measure.css')
'https://cdn.jsdelivr.net/gh/ljagis/leaflet-measure@2.1.7/dist/leaflet-measure.min.css')
]


Expand Down
4 changes: 2 additions & 2 deletions folium/plugins/mouse_position.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@

_default_js = [
('Control_MousePosition_js',
'https://rawcdn.githack.com/ardhi/Leaflet.MousePosition/c32f1c84/src/L.Control.MousePosition.js')
'https://cdn.jsdelivr.net/gh/ardhi/Leaflet.MousePosition/src/L.Control.MousePosition.min.js')
]

_default_css = [
('Control_MousePosition_css',
'https://rawcdn.githack.com/ardhi/Leaflet.MousePosition/c32f1c84/src/L.Control.MousePosition.css')
'https://cdn.jsdelivr.net/gh/ardhi/Leaflet.MousePosition/src/L.Control.MousePosition.min.css')
]


Expand Down
2 changes: 1 addition & 1 deletion folium/plugins/polyline_text_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

_default_js = [
('polylinetextpath',
'https://rawcdn.githack.com/makinacorpus/Leaflet.TextPath/leaflet0.8-dev/leaflet.textpath.js')
'https://cdn.jsdelivr.net/npm/[email protected]/leaflet.textpath.min.js')
]


Expand Down
6 changes: 3 additions & 3 deletions folium/plugins/timestamped_geo_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
('jqueryui1.10.2',
'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js'),
('iso8601',
'https://rawcdn.githack.com/nezasa/iso8601-js-period/master/iso8601.min.js'),
'https://cdn.jsdelivr.net/npm/iso8601-js-period@0.2.1/iso8601.min.js'),
('leaflet.timedimension',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js'), # noqa
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.min.js'), # noqa
('moment',
'https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js')
]
Expand All @@ -26,7 +26,7 @@
('highlight.js_css',
'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css'),
('leaflet.timedimension_css',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css')
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.control.css')
]


Expand Down
6 changes: 3 additions & 3 deletions folium/plugins/timestamped_wmstilelayer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
('jqueryui1.10.2',
'https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js'),
('iso8601',
'https://rawcdn.githack.com/nezasa/iso8601-js-period/master/iso8601.min.js'),
'https://cdn.jsdelivr.net/npm/iso8601-js-period@0.2.1/iso8601.min.js'),
('leaflet.timedimension',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js'), # noqa
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.min.js'), # noqa
]

_default_css = [
('highlight.js_css',
'https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css'),
('leaflet.timedimension_css',
'https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css') # noqa
'https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.control.css') # noqa
]


Expand Down
4 changes: 2 additions & 2 deletions tests/plugins/test_beautify_icon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ def test_beautify_icon():
out = normalize(m._parent.render())

# We verify that the script import is present.
script = '<script src="https://rawcdn.githack.com/marslan390/BeautifyMarker/master/leaflet-beautify-marker-icon.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/gh/marslan390/BeautifyMarker/leaflet-beautify-marker-icon.min.js"></script>' # noqa
assert script in out

# We verify that the css import is present.
css = '<link rel="stylesheet" href="https://rawcdn.githack.com/marslan390/BeautifyMarker/master/leaflet-beautify-marker-icon.css"/>' # noqa
css = '<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/marslan390/BeautifyMarker/leaflet-beautify-marker-icon.min.css"/>' # noqa
assert css in out

# We verify that the Beautiful Icons are rendered correctly.
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/test_dual_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def test_dual_map():
assert isinstance(figure, folium.Figure)
out = normalize(figure.render())

script = '<script src="https://rawcdn.githack.com/jieter/Leaflet.Sync/master/L.Map.Sync.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/gh/jieter/Leaflet.Sync/L.Map.Sync.min.js"></script>' # noqa
assert script in out

tmpl = Template("""
Expand Down
8 changes: 4 additions & 4 deletions tests/plugins/test_heat_map_withtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ def test_heat_map_with_time():
out = normalize(m._parent.render())

# We verify that the script imports are present.
script = '<script src="https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.min.js"></script>' # noqa
assert script in out
script = '<script src="https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/pa7_hm.min.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/pa7_hm.min.js"></script>' # noqa
assert script in out
script = '<script src="https://rawcdn.githack.com/python-visualization/folium/master/folium/templates/pa7_leaflet_hm.min.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/gh/python-visualization/folium/folium/templates/pa7_leaflet_hm.min.js"></script>' # noqa
assert script in out
script = '<link rel="stylesheet" href="https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css"/>' # noqa
script = '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.control.css"/>' # noqa
assert script in out

# We verify that the script part is correct.
Expand Down
2 changes: 1 addition & 1 deletion tests/plugins/test_polyline_text_path.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def test_polyline_text_path():
out = normalize(m._parent.render())

# We verify that the script import is present.
script = '<script src="https://rawcdn.githack.com/makinacorpus/Leaflet.TextPath/leaflet0.8-dev/leaflet.textpath.js"></script>' # noqa
script = '<script src="https://cdn.jsdelivr.net/npm/[email protected]/leaflet.textpath.min.js"></script>' # noqa
assert script in out

# We verify that the script part is correct.
Expand Down
6 changes: 3 additions & 3 deletions tests/plugins/test_timestamped_geo_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ def test_timestamped_geo_json():
# Verify the imports.
assert '<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>' in out
assert '<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>' in out
assert '<script src="https://rawcdn.githack.com/nezasa/iso8601-js-period/master/iso8601.min.js"></script>' in out
assert '<script src="https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.min.js"></script>' in out # noqa
assert '<script src="https://cdn.jsdelivr.net/npm/iso8601-js-period@0.2.1/iso8601.min.js"></script>' in out
assert '<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.min.js"></script>' in out # noqa
assert '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.4/styles/default.min.css"/>' in out # noqa
assert '<link rel="stylesheet" href="https://rawcdn.githack.com/socib/Leaflet.TimeDimension/master/dist/leaflet.timedimension.control.min.css"/>' in out # noqa
assert '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/leaflet.timedimension.control.css"/>' in out # noqa
assert '<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.18.1/moment.min.js"></script>' in out

# Verify that the script is okay.
Expand Down