GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — Merge all maintenance branches by jkseppan · Pull Request #9 · matplotlib/matplotlib

Conversation

@jkseppan

@jkseppan jkseppan commented Feb 20, 2011

Copy link
Copy Markdown
Member

This is the final merge of all maintenance branches to master, done recursively as suggested by Darren in response to pull request #5. If I did this right, the history of each request should contain the previous requests, so that git will believe that each branch contains all the commits of the preceding branches.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

All reactions
mdboom and others added 30 commits July 6, 2010 15:18
@mdboom
Reset clipping upon exit of draw_markers to avoid negative interactio…
230fe53
…n with blitting.

svn path=/trunk/matplotlib/; revision=8515
@mdboom
Merged revisions 8514,8517 via svnmerge from
95fc42c
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8514 | jdh2358 | 2010-07-06 10:48:31 -0400 (Tue, 06 Jul 2010) | 1 line
  
  update coding guide to point to 1.0 release branch
........
  r8517 | mdboom | 2010-07-06 11:30:34 -0400 (Tue, 06 Jul 2010) | 1 line
  
  Testing merging
........

svn path=/trunk/matplotlib/; revision=8518
@mdboom
Merged revisions 8519 via svnmerge from
6d77129
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8519 | mdboom | 2010-07-06 11:31:53 -0400 (Tue, 06 Jul 2010) | 1 line
  
  Testing merging (removing bogus content)
........

svn path=/trunk/matplotlib/; revision=8520
@jdh2358
Merged revisions 8521 via svnmerge from
379d0a9
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8521 | jdh2358 | 2010-07-06 10:48:16 -0500 (Tue, 06 Jul 2010) | 1 line
  
  update download site in site docs
........

svn path=/trunk/matplotlib/; revision=8522
@mdboom
Support optional JPEG and TIFF saving if PIL is installed.
852b41c
svn path=/trunk/matplotlib/; revision=8523
@dopplershift
Some basic changes that allow setup.py to work with both Python 2 and 3.
ecdf54d
svn path=/trunk/matplotlib/; revision=8537
@dopplershift
Fix setting of minor ticklabels. As far as I can tell, the extra call…
88d1efc
… to set_major_formatter is due to an SVN merge error from the transforms branch.

svn path=/trunk/matplotlib/; revision=8538
@dopplershift
Make setupext.py compatible with both Python 2 and 3.
77a6860
svn path=/trunk/matplotlib/; revision=8540
@leejjoon
Merged revisions 8524,8526,8539,8541 via svnmerge from
625632c
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8524 | jdh2358 | 2010-07-06 17:54:21 -0400 (Tue, 06 Jul 2010) | 1 line
  
  add gridspec api to toc
........
  r8526 | mdboom | 2010-07-07 09:19:29 -0400 (Wed, 07 Jul 2010) | 2 lines
  
  Backport of r8515: Reset clipping upon exit of draw_markers to avoid negative interaction with blitting.
........
  r8539 | ryanmay | 2010-07-09 14:30:07 -0400 (Fri, 09 Jul 2010) | 1 line
  
  Fix setting of minor ticklabels. As far as I can tell, the extra call to set_major_formatter is due to an SVN merge error from the transforms branch.
........
  r8541 | leejjoon | 2010-07-13 12:39:40 -0400 (Tue, 13 Jul 2010) | 1 line
  
  Text.draw uses _set_gc_clip to set clip property
........

svn path=/trunk/matplotlib/; revision=8542
@WeatherGod
Merged revisions 8543 via svnmerge from
677233f
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8543 | weathergod | 2010-07-13 21:42:19 -0500 (Tue, 13 Jul 2010) | 2 lines
  
  Added documentation and examples for new, easier Axes3D use.
........

svn path=/trunk/matplotlib/; revision=8544
@mdboom
Testing merging
d34dde8
svn path=/trunk/matplotlib/; revision=8547
@efiring
Merged revisions 8549 via svnmerge from
17c5041
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8549 | efiring | 2010-07-14 07:37:10 -1000 (Wed, 14 Jul 2010) | 2 lines
  
  Axes.margin: bugfix--return correct values.  Thanks to Georges Schutz.
........

svn path=/trunk/matplotlib/; revision=8550
@efiring
Merged revisions 8554 via svnmerge from
3225105
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8554 | efiring | 2010-07-15 07:34:42 -1000 (Thu, 15 Jul 2010) | 2 lines
  
  yaxis.set_ticks_position: fix bug with 'none'; thanks to Ben North
........

svn path=/trunk/matplotlib/; revision=8555
@efiring
Merged revisions 8557 via svnmerge from
bce5b8d
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8557 | efiring | 2010-07-15 10:45:19 -1000 (Thu, 15 Jul 2010) | 3 lines
  
  show for tkagg doesn't block in script called via ipython -pylab.
  This is the first in an expected series of changes to show().
........

svn path=/trunk/matplotlib/; revision=8558
@ianthomas23
Merged revisions 8559 via svnmerge from
2135d78
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8559 | ianthomas23 | 2010-07-16 14:46:14 +0100 (Fri, 16 Jul 2010) | 2 lines
  
  Added tri* functions to pyplot docs.
........

svn path=/trunk/matplotlib/; revision=8560
@efiring
Merged revisions 8559,8562 via svnmerge from
5dbc280
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8559 | ianthomas23 | 2010-07-16 03:46:14 -1000 (Fri, 16 Jul 2010) | 2 lines
  
  Added tri* functions to pyplot docs.
........
  r8562 | efiring | 2010-07-16 10:44:52 -1000 (Fri, 16 Jul 2010) | 3 lines
  
  backends: factored out most of the show() code into ShowBase class.
  Also fixed various fltkagg problems.
........

svn path=/trunk/matplotlib/; revision=8563
@leejjoon
Merged revisions 8562,8564 via svnmerge from
33973bf
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8562 | efiring | 2010-07-16 16:44:52 -0400 (Fri, 16 Jul 2010) | 3 lines
  
  backends: factored out most of the show() code into ShowBase class.
  Also fixed various fltkagg problems.
........
  r8564 | leejjoon | 2010-07-17 03:06:06 -0400 (Sat, 17 Jul 2010) | 1 line
  
  fix wrong baseline for multiple line legend
........

svn path=/trunk/matplotlib/; revision=8565
@ddale
Merged revisions 8566 via svnmerge from
02f5442
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8566 | dsdale | 2010-07-20 10:00:55 -0400 (Tue, 20 Jul 2010) | 2 lines
  
  Return Qt4's default cursor when leaving the canvas
........

svn path=/trunk/matplotlib/; revision=8567
@mdboom
Merged revisions 8568 via svnmerge from
31d9a19
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8568 | mdboom | 2010-07-23 09:17:15 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Prevent traceback when window icon can not be loaded in Gtk backend.
........

svn path=/trunk/matplotlib/; revision=8569
@mdboom
Merged revisions 8570-8571 via svnmerge from
7db4af0
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8570 | mdboom | 2010-07-23 12:45:24 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Fix image clipping to a path and add a test.
........
  r8571 | mdboom | 2010-07-23 12:46:40 -0400 (Fri, 23 Jul 2010) | 2 lines
  
  Oops in last commit.
........

svn path=/trunk/matplotlib/; revision=8572
@efiring
Merged revisions 8573 via svnmerge from
466a6ac
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8573 | efiring | 2010-07-24 11:59:55 -1000 (Sat, 24 Jul 2010) | 3 lines
  
  rcParams: don't include deprecated keys.
  Some other rc cleanups are included in this changeset.
........

svn path=/trunk/matplotlib/; revision=8574
@WeatherGod
Merged revisions 8575 via svnmerge from
1259332
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8575 | weathergod | 2010-07-25 17:24:05 -0500 (Sun, 25 Jul 2010) | 2 lines
  
  Fix "graph jumping" issue when rubber-banding a selection in GTK backends.
........

svn path=/trunk/matplotlib/; revision=8576
@efiring
Merged revisions 8577 via svnmerge from
11cb4a3
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8577 | efiring | 2010-07-26 08:17:18 -1000 (Mon, 26 Jul 2010) | 2 lines
  
  [3026430] delete duplicate test file with space in name
........

svn path=/trunk/matplotlib/; revision=8578
@efiring
Merged revisions 8579 via svnmerge from
b0ccfee
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8579 | efiring | 2010-07-26 09:14:16 -1000 (Mon, 26 Jul 2010) | 2 lines
  
  [3032390] subplot: more robust argument handling, consistent with 0.99.3
........

svn path=/trunk/matplotlib/; revision=8580
@leejjoon
Merged revisions 8581 via svnmerge from
e7727ad
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8581 | leejjoon | 2010-07-27 11:52:47 -0400 (Tue, 27 Jul 2010) | 1 line
  
  fix pyplot.subplot2grid to support the projection keyword
........

svn path=/trunk/matplotlib/; revision=8582
@mdboom
Merged revisions 8583 via svnmerge from
c4e75e3
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8583 | mdboom | 2010-07-27 13:26:50 -0400 (Tue, 27 Jul 2010) | 3 lines
  
  [3034778] line width arguments don't work in pcolormesh
  Also, support clipping paths on images in SVG backend.
........

svn path=/trunk/matplotlib/; revision=8584
@mdboom
Merged revisions 8585 via svnmerge from
9152332
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8585 | mdboom | 2010-07-28 14:33:11 -0400 (Wed, 28 Jul 2010) | 2 lines
  
  Fix problems displaying images with zero (logical) width.
........

svn path=/trunk/matplotlib/; revision=8586
@mdboom
Merged revisions 8588 via svnmerge from
ed5afc8
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8588 | mdboom | 2010-07-28 14:48:14 -0400 (Wed, 28 Jul 2010) | 2 lines
  
  [3032853] Hist autorange bug using log and histtype
........

svn path=/trunk/matplotlib/; revision=8589
@mdboom
Merged revisions 8590 via svnmerge from
40412b9
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8590 | mdboom | 2010-07-28 15:19:27 -0400 (Wed, 28 Jul 2010) | 3 lines
  
  [3031954] polar plot axis labeling problem
  Radial axis labels should now be placed correctly, even for small values of rmax
........

svn path=/trunk/matplotlib/; revision=8591
@WeatherGod
Merged revisions 8593 via svnmerge from
0d79d80
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8593 | weathergod | 2010-07-29 11:16:17 -0500 (Thu, 29 Jul 2010) | 4 lines
  
  Fix documentation for set_linestyle() and set_marker() and a few other
  functions properly display their available values on the web docs.
  Also changed pentagram to pentagon in the docstrings.
........

svn path=/trunk/matplotlib/; revision=8594
ivanov and others added 24 commits January 24, 2011 09:41
@ivanov
new broken axis example
7330b6a
svn path=/trunk/matplotlib/; revision=8935
@mdehoon
Make an autorelease pool, otherwise we're leaking memory.
e8d2098
svn path=/trunk/matplotlib/; revision=8936
@mdboom
Merged revisions 8939 via svnmerge from
aabb275
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8939 | mdboom | 2011-02-01 11:02:54 -0500 (Tue, 01 Feb 2011) | 1 line
  
  [3167200] Use from PIL import Image
........

svn path=/trunk/matplotlib/; revision=8942
@efiring
Image generation no longer generates double-precision rgba; patch by …
358855c
…C. Gohlke

Image generation via color mapping was using doubles for rgba,
after which the _image module was converting rgba to uint8;
this patch saves time and memory by using the existing ability
of the colormap to generate uint8 directly.


svn path=/trunk/matplotlib/; revision=8945
@efiring
speed up Normalize, LogNorm, colormapping; modified patch by C. Gohlke
acd19a1
svn path=/trunk/matplotlib/; revision=8946
@efiring
cbook.report_memory: add Windows support via "tasklist"
053b70b
svn path=/trunk/matplotlib/; revision=8947
@efiring
image: more conversion to use rgba bytes, other minor cleanup
93c041b
svn path=/trunk/matplotlib/; revision=8948
@efiring
PcolorImage: use local cache instead of the ScalarMappable.update_dict
fc97fc8
svn path=/trunk/matplotlib/; revision=8949
@efiring
collections with color mapping: don't update rgba unnecesarily
a16099f
svn path=/trunk/matplotlib/; revision=8950
@efiring
bugfix: Collection.set_edgecolor was failing in mplot3d/contour_demo2
715a38f
svn path=/trunk/matplotlib/; revision=8951
@efiring
backend_qt4.py: eliminate unnecessary import of Qt; closes [3108017]
a26f684
svn path=/trunk/matplotlib/; revision=8952
@efiring
Merged revisions 8953 via svnmerge from
033012b
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8953 | efiring | 2011-02-06 07:49:43 -1000 (Sun, 06 Feb 2011) | 2 lines
  
  bug: xlim, ylim with no arguments should not affect autoscaling
........

svn path=/trunk/matplotlib/; revision=8954
@jkseppan
Quick workaround for dviread bug #3175113
708c451
svn path=/trunk/matplotlib/; revision=8956
@WeatherGod
Removed misleading returns in xscale() and yscale().
cc95248
svn path=/trunk/matplotlib/; revision=8957
@efiring
cbook.report_memory: restore compatibility with earlier subprocess ve…
c8c5c32
…rsions

svn path=/trunk/matplotlib/; revision=8958
@efiring
Normalize: major speed-up via bypassing masked array division
fb0a4cf
svn path=/trunk/matplotlib/; revision=8965
@efiring
_image.cpp: speed up image_frombyte; patch by C. Gohlke
13e4704
Non-contiguous arrays, such as those resulting from pan and zoom,
are handled efficiently without additional copying.  This
noticeably speeds up zoom and pan on large images.

svn path=/trunk/matplotlib/; revision=8966
@efiring
bugfix: handle alpha correctly in colormapping with uint8
d47f836
svn path=/trunk/matplotlib/; revision=8968
@efiring
LogNorm: speed-up by dealing with mask explicitly
fc6d355
svn path=/trunk/matplotlib/; revision=8969
@mdboom
Adding canonical baseline images
9c6de2d
svn path=/trunk/matplotlib/; revision=8984
@mdboom
Update image_interps.pdf baseline image.
c2ae0b7
svn path=/trunk/matplotlib/; revision=8985
@mdboom
Fix long Unicode characters in SVG backend (fixes mathtext_stixsans t…
62d4178
…est on narrow Python builds.)

svn path=/trunk/matplotlib/; revision=8986
@WeatherGod
scatter() now supports empty arrays as input (i.e., scatter([], []) i…
86774fc
…s now valid).

Enabling this required fixes in both scatter() and in collections.py.
Collections now support empty versions of themselves more correctly due to these fixes.

svn path=/trunk/matplotlib/; revision=8988
@jkseppan
Merge branch 'v1.0.x' into merge-maintenance
0290e85
This marks all maintenance branches as merged.
@ddale

ddale commented Feb 20, 2011

Copy link
Copy Markdown
Contributor

This has been merged, but I amended the commit message to be:

Merge branch 'v1.0.x' into master

so I need to close it manually.

All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.

@richbwood richbwood mentioned this pull request Dec 19, 2012
test_pcolormesh hangs #1609
Closed
magnunor pushed a commit to magnunor/matplotlib that referenced this pull request Dec 5, 2013
@francisco-dlp
Fixes matplotlib#9 by adding a squeeze method to Signal that is calle…
8a5ed18
…d on load and when the crop method is executed
tacaswell added a commit that referenced this pull request Jan 11, 2015
@tacaswell
Merge pull request #9 from blink1073/pr/3965
7eba384
Set focus policy to match Qt, remove outline in webagg
swfiua pushed a commit to swfiua/matplotlib that referenced this pull request Mar 17, 2017
@Ka1lon
Merge pull request matplotlib#9 from swfiua/bayamon
c47f6d4
Bayamon
@WeatherGod WeatherGod mentioned this pull request Mar 2, 2018
pyplot hangs at plot() #10648
Closed
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

14 participants

@jkseppan @ddale @mdboom @jdh2358 @dopplershift @leejjoon @WeatherGod @efiring @ianthomas23 @astraw @mdehoon @heeres @fperez @ivanov
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.