FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Bugfix/anim3d example by WeatherGod · Pull Request #22 · matplotlib/matplotlib · GitHub

Repository navigation

Bugfix/anim3d example - #22

Merged
1 commit merged into
matplotlib:masterfrom
WeatherGod:bugfix/anim3d_example
Feb 26, 2011
Merged

1 commit merged into
matplotlib:masterfrom
WeatherGod:bugfix/anim3d_example

Conversation

Copy link
Copy Markdown
Member

Something in numpy must have changed recently to break the poorly done old code. This approach is correct.

Copy link
Copy Markdown
Member Author

Ok, I must be stupid. I can merge this with my local repo, and I can push it up to my forked master, but I can't seem to get this to merge to matplotlib.

ddale commented Feb 25, 2011

Copy link
Copy Markdown
Contributor

have a look at https://github.com/WeatherGod/matplotlib/network . You need to do the following:

git checkout master
#assuming you have a remote named  matplotlib pointing to github.com/matplotlib/matplotlib:
git pull matplotlib master
git merge bugfix/anim3d_example
git push matplotlib master

Having said that, shouldn't these changes be made on the v1.0.x branch? From there, we can merge the v1.0.x branch into master.

Copy link
Copy Markdown
Member Author

I figured it out before reading your comment. It does make sense to commit to v1.0.x first. How do we fix this?

ddale commented Feb 26, 2011

Copy link
Copy Markdown
Contributor

I don't know. You should not have pushed the change to master.

Copy link
Copy Markdown
Member Author

Duh, nevermind... animations came after version 1.0. This example isn't in the 1.0.x branch.

richbwood mentioned this pull request Dec 19, 2012
magnunor pushed a commit to magnunor/matplotlib that referenced this pull request Dec 5, 2013
WeatherGod deleted the bugfix/anim3d_example branch July 23, 2014 12:55
fariza added a commit to fariza/matplotlib that referenced this pull request Sep 22, 2016
swfiua added a commit to swfiua/matplotlib that referenced this pull request Mar 17, 2017
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants


Back | FazBrowse Home | New Git URL