Skip to content

RawGit Deprecation #1002

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 120 commits into from
Oct 28, 2018
Merged

Conversation

jtbaker
Copy link
Contributor

@jtbaker jtbaker commented Oct 20, 2018

Swapped all references to rawgit.com to rawcdn.githack.com. Pretty sure I got everything. Closes #997.

jtbaker added 30 commits June 14, 2018 19:49
Added a new Tooltip class to reference GeoJson feature properties, with tests, documentation, and examples. It's flexible, and can take field names, aliases, that can be turned on/off with the 'labels' boolean, a 'sticky' property, and can incorporate Javascript's .toLocaleString() functionality if desired. The same string can be passed for each object with the 'text' variable as well if you'd rather not use the 'fields'.

Also updated the GeoJson JS template to reference this Tooltip object, and added a test to make sure that the values passed exist in the properties.
Further linting.
Seems like maybe the f-string usage in the geojson fields assertion check is causing the build failure. Testing normal string concatenation.
Reverted accidental vega_parse change.
Fixed docstring indentation.
Updating Tooltip docstring broke 120 char line limit.
Removed trailing white space.
Updating my fork to current Master.
…iLang.xml, ide.general.xml, Default.xml, project.default.xml, diff.xml, git.xml, other.xml, jdk.table.xml, Default.xml, code.style.schemes, find.xml, ui.lnf.xml, laf.xml, filetypes.xml, projectView.xml, vcs.xml, editor.codeinsight.xml, notifications.xml, keymap.xml, editor.xml, github_settings.xml, debugger.xml
…, IntelliLang.xml, ide.general.xml, Default.xml, project.default.xml, diff.xml, git.xml, other.xml, jdk.table.xml, Default.xml, code.style.schemes, find.xml, ui.lnf.xml, laf.xml, filetypes.xml, projectView.xml, vcs.xml, editor.codeinsight.xml, notifications.xml, keymap.xml, editor.xml, github_settings.xml, debugger.xml"

This reverts commit 76c9622.
@jtbaker jtbaker mentioned this pull request Oct 20, 2018
@ocefpaf
Copy link
Member

ocefpaf commented Oct 23, 2018

@jtbaker I'm not sure you meant for all those commits to be in this PR, right?

@Conengmo
Copy link
Member

@jtbaker the xml's ended up being committed again :) Can you remove them? After that I'll add a changelog entry and merge. Thanks for making this PR!

By the way, what do you use to do git stuff? If you'd like we could maybe share our workflows, see what can be improved.

@ocefpaf
Copy link
Member

ocefpaf commented Oct 24, 2018

By the way, what do you use to do git stuff? If you'd like we could maybe share our workflows, see what can be improved.

That is a good question! I'm a big fan of fork-branch-PR. Sometimes I don't even have a master on my fork so I'm forced to always fetch the latest master-dev and branch from there when adding a new feature or fixing a bug.

PS: would you two be available for a live meeting to discuss that and more about folium?

@Conengmo
Copy link
Member

I removed the xmls and added a line to the changelog. Good to merge IMO.

would you two be available for a live meeting to discuss that and more about folium?

That would be nice! What's a good channel to set this up, Gitter? I should check more often or enable notifications then.

@Conengmo Conengmo merged commit 8253c72 into python-visualization:master Oct 28, 2018
@Conengmo
Copy link
Member

Merged! Thanks @jtbaker, glad we got this done now already :)

@ocefpaf
Copy link
Member

ocefpaf commented Oct 28, 2018

That would be nice! What's a good channel to set this up, Gitter? I should check more often or enable notifications then.

Yep. We can use gitter. Unless you have another suggestion.

@jtbaker
Copy link
Contributor Author

jtbaker commented Oct 29, 2018

@Conengmo sorry for the delay on my part, it has been a really busy work week. Thanks for the help! I think early on in my history with the project I accidentally committed the XMLs to my master branch and it has hosed my repository ever since and it is seemingly impossible to get them out of version control - I've tried rebasing my master and PRing from the folium main master etc. - I think I just need to close my fork and make a new one.

PS: would you two be available for a live meeting to discuss that and more about folium?

That sounds great @ocefpaf, I'd like to be a part of it. I'm on US on CDT time.

@ocefpaf
Copy link
Member

ocefpaf commented Oct 29, 2018

I think I just need to close my fork and make a new one.

That is one way to fix it. The other one is to remove your master locally, re-check upstream's master and force push it. It would be something like:

git checkout upstream/master
git branch -D master
git checkout -b master
git push --set-upstream origin master -f

PS: consider having a development cycle without master. That way one can always check the latest master from upstream and start a new feature branch.

@ocefpaf
Copy link
Member

ocefpaf commented Oct 29, 2018

That sounds great @ocefpaf, I'd like to be a part of it. I'm on US on CDT time.

@Conengmo and @jtbaker how about November 7th (Wednesday) around 14:00 Eastern? (That should be 13:00 CDT, right @jtbaker?)

@Conengmo
Copy link
Member

I'm available them. I'm on Central European time so that's 19:00 for me if I'm not mistaken.

@ocefpaf
Copy link
Member

ocefpaf commented Oct 29, 2018

I'm available them. I'm on Central European time so that's 19:00 for me if I'm not mistaken.

We can do it sooner then, I don't want to bother you at 19:00 😄

How about 14:00 UTC? That would be 15:00 for @Conengmo, 11:00 to me, and 9:00 for @jtbaker.

@Conengmo
Copy link
Member

Perfect

@jtbaker
Copy link
Contributor Author

jtbaker commented Oct 29, 2018

How about 14:00 UTC? That would be 15:00 for @Conengmo, 11:00 to me, and 9:00 for @jtbaker.

Sounds good to me! This will be during my work hours, so there's a chance I could get pulled aside for a moment, but it is unlikely. Looking forward to the discussion.

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.

3 participants