Skip to content

bump to leaflet 1.5.1 #1149

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.

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 11 commits into from
May 26, 2019
Merged

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented May 12, 2019

Closes #1147

@ocefpaf
Copy link
Member Author

ocefpaf commented May 12, 2019

The Following notebooks are broken with leaflet 1.5.0 and probably need some sort of update/fix:

  • TimeSliderChoropleth
  • Plugin (DualMap) but this one is also broken with 1.4.0

@ocefpaf ocefpaf requested a review from Conengmo May 12, 2019 19:34
@Conengmo
Copy link
Member

Hi @ocefpaf, nice that you made a PR for this. I saw they released a hotfix, v1.5.1, can you update? https://leafletjs.com/2019/05/08/leaflet-1.5.1.html

I don't know if this fixes the timesliderchoropleth notebook. I'll have a look at the dualmap plugin.

@ocefpaf ocefpaf changed the title bump to leaflet 1.5.0 bump to leaflet 1.5.1 May 13, 2019
@@ -287,7 +287,7 @@ class CircleMarker(Marker):
Radius of the circle marker, in pixels.
**kwargs
Other valid (possibly inherited) options. See:
https://leafletjs.com/reference-1.4.0.html#circlemarker
https://leafletjs.com/reference-1.5.1.html#circlemarker
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Conengmo looks like this URL re-directs to 1.5.0 and makes me think that they are not going to publish a 1.5.1 version of the docs. I guess that we should make the sphinx link check a soft fail so we can merge this and create our docs. What do you think?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, it seems they always only publish docs for the major and minor versions. I don't know that much about Sphinx. I'm thinking now it may be easiest to only link to their documentation of the minor versions as well? So change all documentation links to 'reference-1.5.0'. Those links will also perhaps resolve faster since there's no redirect.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is properly redirected so I just moved the linkcheck part of sphinx to a "allow failures" tests. It was meant to be just a report and not really a hard error.

@Conengmo
Copy link
Member

The TimeSliderChoropleth notebook runs without errors, but the time slider functionality doesn't work properly. It's not an external plugin, but a custom template using D3. I don't feel like learning d3 to be able to maintain the plugin, so maybe it's better to just deprecate the plugin.

@ocefpaf
Copy link
Member Author

ocefpaf commented May 25, 2019

The TimeSliderChoropleth notebook runs without errors, but the time slider functionality doesn't work properly. It's not an external plugin, but a custom template using D3. I don't feel like learning d3 to be able to maintain the plugin, so maybe it's better to just deprecate the plugin.

Let's do that in another PR. I'll fix the merge conflicts here in a moment.

@ocefpaf
Copy link
Member Author

ocefpaf commented May 25, 2019

@Conengmo this is ready for another pass.

@Conengmo
Copy link
Member

I found one outdated link and pushed that to your branch. Other than that this looks good to go!

I'm thinking though, maybe we should first make a 0.9.1 release with the fix for the geojson feature identifier. Then merge this afterwards for a new minor version release. What do you think?

@ocefpaf
Copy link
Member Author

ocefpaf commented May 26, 2019

I found one outdated link and pushed that to your branch. Other than that this looks good to go!

Oops. Missed that one.

I'm thinking though, maybe we should first make a 0.9.1 release with the fix for the geojson feature identifier. Then merge this afterwards for a new minor version release. What do you think?

Sure. Let me work on that releases.

@ocefpaf
Copy link
Member Author

ocefpaf commented May 26, 2019

I'm thinking though, maybe we should first make a 0.9.1 release

Done!

PS: there is a transient failure in one of the notebooks but it is safe to merge.
I'm planning on a major re-factoring of the notebooks. Moving most of them to an external repository (gallery) and keeping only those that are valid as tests.

@Conengmo
Copy link
Member

Conengmo commented May 26, 2019

Thanks @ocefpaf!

I'll go ahead and merge this one.

I'm planning on a major re-factoring of the notebooks

Awesome, let me know if I can help with anything.

Moving most of them to an external repository (gallery)

That makes a lot of sense. It would be nice if we would have a single site with our readme, docs, examples. Everything under a URL that doesn't change with versions or source tree layout.

keeping only those that are valid as tests

I don't know if we should use any as tests. I'd rather write explicit tests for the code and the browser functionality, with something like Selenium.

Then again, if a notebook fails after a change in folium that is a good indicator something is wrong :)

@Conengmo Conengmo merged commit cc5e8d9 into python-visualization:master May 26, 2019
@ocefpaf ocefpaf deleted the leaflet_1.5.0 branch May 26, 2019 13:18
@ocefpaf
Copy link
Member Author

ocefpaf commented May 26, 2019

I don't know if we should use any as tests. I'd rather write explicit tests for the code and the browser functionality, with something like Selenium.

That is definitely better, the notebooks are kind of a poor's man browser tests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to Leaflet 1.5.0
2 participants