SF.net SVN: matplotlib:[6658] branches/v0_98_5_maint
Revision: 6658
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6658&view=rev
Author: leejjoon
Date: 2008-12-18 08:55:50 + (Thu, 18 Dec 2008)
Log Message:
---
fix dpi-dependent behavior of text bbox & annotate arrow
Modified Paths:
--
branches/v0_98_5_maint/CHANGELOG
branches/v0_98_5_maint/lib/matplotlib/text.py
Modified: branches/v0_98_5_maint/CHANGELOG
===
--- branches/v0_98_5_maint/CHANGELOG2008-12-17 23:37:18 UTC (rev 6657)
+++ branches/v0_98_5_maint/CHANGELOG2008-12-18 08:55:50 UTC (rev 6658)
@@ -1,3 +1,6 @@
+2008-12-17 fix dpi-dependent behavior of text bbox and arrow in annotate
+-JJL
+
2008-12-16 Another attempt to fix dpi-dependent behavior of Legend. -JJL
==
Modified: branches/v0_98_5_maint/lib/matplotlib/text.py
===
--- branches/v0_98_5_maint/lib/matplotlib/text.py 2008-12-17 23:37:18 UTC
(rev 6657)
+++ branches/v0_98_5_maint/lib/matplotlib/text.py 2008-12-18 08:55:50 UTC
(rev 6658)
@@ -367,7 +367,8 @@
def update_bbox_position_size(self, renderer):
-""" Update the location and the size of the bbox. This method
+"""
+Update the location and the size of the bbox. This method
should be used when the position and size of the bbox needs to
be updated before actually drawing the bbox.
"""
@@ -395,8 +396,8 @@
tr = mtransforms.Affine2D().rotate(theta)
tr = tr.translate(posx+x_box, posy+y_box)
self._bbox_patch.set_transform(tr)
-fontsize = renderer.points_to_pixels(self.get_size())
-self._bbox_patch.set_mutation_scale(fontsize)
+fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
#self._bbox_patch.draw(renderer)
else:
@@ -434,7 +435,8 @@
tr = mtransforms.Affine2D().rotate(theta)
tr = tr.translate(posx+x_box, posy+y_box)
self._bbox_patch.set_transform(tr)
-self._bbox_patch.set_mutation_scale(self.get_size())
+fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
self._bbox_patch.draw(renderer)
@@ -1557,6 +1559,7 @@
self.arrow_patch.set_positions((ox0, oy0), (ox1,oy1))
mutation_scale = d.pop("mutation_scale", self.get_size())
+mutation_scale = renderer.points_to_pixels(mutation_scale)
self.arrow_patch.set_mutation_scale(mutation_scale)
if self._bbox_patch:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6659] trunk/matplotlib
Revision: 6659
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6659&view=rev
Author: leejjoon
Date: 2008-12-18 09:02:11 + (Thu, 18 Dec 2008)
Log Message:
---
Merged revisions 6658 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
r6658 | leejjoon | 2008-12-18 03:55:50 -0500 (Thu, 18 Dec 2008) | 1 line
fix dpi-dependent behavior of text bbox & annotate arrow
Modified Paths:
--
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/text.py
Property Changed:
trunk/matplotlib/
Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6653
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6658
Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG 2008-12-18 08:55:50 UTC (rev 6658)
+++ trunk/matplotlib/CHANGELOG 2008-12-18 09:02:11 UTC (rev 6659)
@@ -1,3 +1,6 @@
+2008-12-17 fix dpi-dependent behavior of text bbox and arrow in annotate
+-JJL
+
2008-12-17 Add group id support in artist. Two examples which
demostrate svg filter are added. -JJL
Modified: trunk/matplotlib/lib/matplotlib/text.py
===
--- trunk/matplotlib/lib/matplotlib/text.py 2008-12-18 08:55:50 UTC (rev
6658)
+++ trunk/matplotlib/lib/matplotlib/text.py 2008-12-18 09:02:11 UTC (rev
6659)
@@ -367,7 +367,8 @@
def update_bbox_position_size(self, renderer):
-""" Update the location and the size of the bbox. This method
+"""
+Update the location and the size of the bbox. This method
should be used when the position and size of the bbox needs to
be updated before actually drawing the bbox.
"""
@@ -395,8 +396,8 @@
tr = mtransforms.Affine2D().rotate(theta)
tr = tr.translate(posx+x_box, posy+y_box)
self._bbox_patch.set_transform(tr)
-fontsize = renderer.points_to_pixels(self.get_size())
-self._bbox_patch.set_mutation_scale(fontsize)
+fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
#self._bbox_patch.draw(renderer)
else:
@@ -434,7 +435,8 @@
tr = mtransforms.Affine2D().rotate(theta)
tr = tr.translate(posx+x_box, posy+y_box)
self._bbox_patch.set_transform(tr)
-self._bbox_patch.set_mutation_scale(self.get_size())
+fontsize_in_pixel = renderer.points_to_pixels(self.get_size())
+self._bbox_patch.set_mutation_scale(fontsize_in_pixel)
self._bbox_patch.draw(renderer)
@@ -1563,6 +1565,7 @@
self.arrow_patch.set_positions((ox0, oy0), (ox1,oy1))
mutation_scale = d.pop("mutation_scale", self.get_size())
+mutation_scale = renderer.points_to_pixels(mutation_scale)
self.arrow_patch.set_mutation_scale(mutation_scale)
if self._bbox_patch:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6661] branches/v0_98_5_maint
Revision: 6661
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6661&view=rev
Author: mdboom
Date: 2008-12-18 13:41:35 + (Thu, 18 Dec 2008)
Log Message:
---
Fix bug where a line with NULL data limits prevents subsequent data limits from
calculating correctly
Modified Paths:
--
branches/v0_98_5_maint/CHANGELOG
branches/v0_98_5_maint/src/_path.cpp
Modified: branches/v0_98_5_maint/CHANGELOG
===
--- branches/v0_98_5_maint/CHANGELOG2008-12-18 12:10:51 UTC (rev 6660)
+++ branches/v0_98_5_maint/CHANGELOG2008-12-18 13:41:35 UTC (rev 6661)
@@ -1,3 +1,8 @@
+2008-12-18 Fix bug where a line with NULL data limits prevents
+ subsequent data limits from calculating correctly - MGD
+
+2008-12-17 Major documentation generator changes - MGD
+
2008-12-17 Applied macosx backend patch with support for path
collections, quadmesh, etc... - JDH
@@ -3,4 +8,5 @@
2008-12-17 fix dpi-dependent behavior of text bbox and arrow in annotate
-JJL
+
2008-12-16 Another attempt to fix dpi-dependent behavior of Legend. -JJL
Modified: branches/v0_98_5_maint/src/_path.cpp
===
--- branches/v0_98_5_maint/src/_path.cpp2008-12-18 12:10:51 UTC (rev
6660)
+++ branches/v0_98_5_maint/src/_path.cpp2008-12-18 13:41:35 UTC (rev
6661)
@@ -403,10 +403,25 @@
}
else
{
-extents_data[0] = std::min(x0, x1);
-extents_data[1] = std::min(y0, y1);
-extents_data[2] = std::max(x0, x1);
-extents_data[3] = std::max(y0, y1);
+if (x0 > x1)
+{
+extents_data[0] = std::numeric_limits::infinity();
+extents_data[2] = -std::numeric_limits::infinity();
+}
+else
+{
+extents_data[0] = x0;
+extents_data[2] = x1;
+}
+if (y0 > y1) {
+extents_data[1] = std::numeric_limits::infinity();
+extents_data[3] = -std::numeric_limits::infinity();
+}
+else
+{
+extents_data[1] = y0;
+extents_data[3] = y1;
+}
minpos_data[0] = xm;
minpos_data[1] = ym;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6662] branches/v0_98_5_maint/doc/api/ font_manager_api.rst
Revision: 6662 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6662&view=rev Author: mdboom Date: 2008-12-18 13:42:13 + (Thu, 18 Dec 2008) Log Message: --- Fix docstring typo. Modified Paths: -- branches/v0_98_5_maint/doc/api/font_manager_api.rst Modified: branches/v0_98_5_maint/doc/api/font_manager_api.rst === --- branches/v0_98_5_maint/doc/api/font_manager_api.rst 2008-12-18 13:41:35 UTC (rev 6661) +++ branches/v0_98_5_maint/doc/api/font_manager_api.rst 2008-12-18 13:42:13 UTC (rev 6662) @@ -11,7 +11,7 @@ :show-inheritance: :mod:`matplotlib.fontconfig_pattern` - + .. automodule:: matplotlib.fontconfig_pattern :members: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6664] trunk/matplotlib
Revision: 6664 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6664&view=rev Author: leejjoon Date: 2008-12-18 15:38:33 + (Thu, 18 Dec 2008) Log Message: --- add new arrow style (a line + filled triangles) Modified Paths: -- trunk/matplotlib/CHANGELOG trunk/matplotlib/examples/pylab_examples/fancyarrow_demo.py trunk/matplotlib/examples/pylab_examples/fancybox_demo2.py trunk/matplotlib/lib/matplotlib/bezier.py trunk/matplotlib/lib/matplotlib/patches.py Modified: trunk/matplotlib/CHANGELOG === --- trunk/matplotlib/CHANGELOG 2008-12-18 13:47:19 UTC (rev 6663) +++ trunk/matplotlib/CHANGELOG 2008-12-18 15:38:33 UTC (rev 6664) @@ -1,3 +1,5 @@ +2008-12-18 add new arrow style, a line + filled triangles. -JJL + 2008-12-18 Fix bug where a line with NULL data limits prevents subsequent data limits from calculating correctly - MGD Modified: trunk/matplotlib/examples/pylab_examples/fancyarrow_demo.py === --- trunk/matplotlib/examples/pylab_examples/fancyarrow_demo.py 2008-12-18 13:47:19 UTC (rev 6663) +++ trunk/matplotlib/examples/pylab_examples/fancyarrow_demo.py 2008-12-18 15:38:33 UTC (rev 6664) @@ -3,23 +3,26 @@ styles = mpatches.ArrowStyle.get_styles() -figheight = (len(styles)+.5) -fig1 = plt.figure(1, (4, figheight)) -fontsize = 0.3 * fig1.dpi +ncol=2 +nrow = len(styles) // ncol + 1 +figheight = (nrow+0.5) +fig1 = plt.figure(1, (4.*ncol/1.5, figheight/1.5)) +fontsize = 0.2 * 70 ax = fig1.add_axes([0, 0, 1, 1], frameon=False, aspect=1.) -ax.set_xlim(0, 4) +ax.set_xlim(0, 4*ncol) ax.set_ylim(0, figheight) for i, (stylename, styleclass) in enumerate(sorted(styles.items())): -y = (float(len(styles)) -0.25 - i) # /figheight -p = mpatches.Circle((3.2, y), 0.2, fc="w") +x = 3.2 + (i//nrow)*4 +y = (figheight - 0.7 - i%nrow) # /figheight +p = mpatches.Circle((x, y), 0.2, fc="w") ax.add_patch(p) -ax.annotate(stylename, (3.2, y), -(2., y), +ax.annotate(stylename, (x, y), +(x-1.2, y), #xycoords="figure fraction", textcoords="figure fraction", ha="right", va="center", size=fontsize, Modified: trunk/matplotlib/examples/pylab_examples/fancybox_demo2.py === --- trunk/matplotlib/examples/pylab_examples/fancybox_demo2.py 2008-12-18 13:47:19 UTC (rev 6663) +++ trunk/matplotlib/examples/pylab_examples/fancybox_demo2.py 2008-12-18 15:38:33 UTC (rev 6664) @@ -4,8 +4,8 @@ styles = mpatch.BoxStyle.get_styles() figheight = (len(styles)+.5) -fig1 = plt.figure(1, (4, figheight)) -fontsize = 0.4 * fig1.dpi +fig1 = plt.figure(1, (4/1.5, figheight/1.5)) +fontsize = 0.3 * 72 for i, (stylename, styleclass) in enumerate(styles.items()): fig1.text(0.5, (float(len(styles)) - 0.5 - i)/figheight, stylename, @@ -15,3 +15,4 @@ bbox=dict(boxstyle=stylename, fc="w", ec="k")) plt.draw() plt.show() + Modified: trunk/matplotlib/lib/matplotlib/bezier.py === --- trunk/matplotlib/lib/matplotlib/bezier.py 2008-12-18 13:47:19 UTC (rev 6663) +++ trunk/matplotlib/lib/matplotlib/bezier.py 2008-12-18 15:38:33 UTC (rev 6664) @@ -468,6 +468,38 @@ +def make_path_regular(p): +""" +fill in the codes if None. +""" +c = p.codes +if c is None: +c = np.empty(p.vertices.shape, "i") +c.fill(Path.LINETO) +c[0] = Path.MOVETO + +return Path(p.vertices, c) +else: +return p + +def concatenate_paths(paths): +""" +concatenate list of paths into a single path. +""" + +vertices = [] +codes = [] +for p in paths: +p = make_path_regular(p) +vertices.append(p.vertices) +codes.append(p.codes) + +_path = Path(np.concatenate(vertices), + np.concatenate(codes)) +return _path + + + if 0: path = Path([(0, 0), (1, 0), (2, 2)], [Path.MOVETO, Path.CURVE3, Path.CURVE3]) @@ -476,3 +508,4 @@ ax = gca() + Modified: trunk/matplotlib/lib/matplotlib/patches.py === --- trunk/matplotlib/lib/matplotlib/patches.py 2008-12-18 13:47:19 UTC (rev 6663) +++ trunk/matplotlib/lib/matplotlib/patches.py 2008-12-18 15:38:33 UTC (rev 6664) @@ -2176,6 +2176,7 @@ from matplotlib.bezier import get_intersection, inside_circle, get_parallels from matplotlib.bezier import make_wedged_bezier2 from matplotlib.bezier import split_path_inout, get_cos_sin +from matplotlib.bezier import make_path_regular, concatenate_paths class ConnectionStyle(_Style): @@ -2627,12 +2628,15 @@ def transmute(self, path, mutation_size, linewidth): """ Th
SF.net SVN: matplotlib:[6666] branches/v0_98_5_maint
Revision: http://matplotlib.svn.sourceforge.net/matplotlib/?rev=&view=rev Author: jdh2358 Date: 2008-12-18 16:31:44 + (Thu, 18 Dec 2008) Log Message: --- tagging release 0.98.5.2 Modified Paths: -- branches/v0_98_5_maint/CHANGELOG branches/v0_98_5_maint/doc/api/api_changes.rst Modified: branches/v0_98_5_maint/CHANGELOG === --- branches/v0_98_5_maint/CHANGELOG2008-12-18 16:29:51 UTC (rev 6665) +++ branches/v0_98_5_maint/CHANGELOG2008-12-18 16:31:44 UTC (rev ) @@ -1,4 +1,8 @@ +=== +Release 0.98.5.2 at r6665 +2008-12-18 Removed configobj and experimental traits - JDH + 2008-12-18 Fix bug where a line with NULL data limits prevents subsequent data limits from calculating correctly - MGD Modified: branches/v0_98_5_maint/doc/api/api_changes.rst === --- branches/v0_98_5_maint/doc/api/api_changes.rst 2008-12-18 16:29:51 UTC (rev 6665) +++ branches/v0_98_5_maint/doc/api/api_changes.rst 2008-12-18 16:31:44 UTC (rev ) @@ -8,6 +8,7 @@ Changes for 0.98.x == +* Removed the configobj and experiemtnal traits rc support * Modified :func:`matplotlib.mlab.psd`, :func:`matplotlib.mlab.csd`, :func:`matplotlib.mlab.cohere`, and :func:`matplotlib.mlab.specgram` This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6667] branches/v0_98_5_maint/doc/mpl_data
Revision: 6667 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6667&view=rev Author: jdh2358 Date: 2008-12-18 17:02:41 + (Thu, 18 Dec 2008) Log Message: --- removed mpl_data Removed Paths: - branches/v0_98_5_maint/doc/mpl_data Deleted: branches/v0_98_5_maint/doc/mpl_data === --- branches/v0_98_5_maint/doc/mpl_data 2008-12-18 16:31:44 UTC (rev ) +++ branches/v0_98_5_maint/doc/mpl_data 2008-12-18 17:02:41 UTC (rev 6667) @@ -1 +0,0 @@ -link ../lib/matplotlib/mpl-data/ \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6668] branches/v0_98_5_maint/CHANGELOG
Revision: 6668 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6668&view=rev Author: jdh2358 Date: 2008-12-18 17:03:47 + (Thu, 18 Dec 2008) Log Message: --- retagging for 98.5.2 Modified Paths: -- branches/v0_98_5_maint/CHANGELOG Modified: branches/v0_98_5_maint/CHANGELOG === --- branches/v0_98_5_maint/CHANGELOG2008-12-18 17:02:41 UTC (rev 6667) +++ branches/v0_98_5_maint/CHANGELOG2008-12-18 17:03:47 UTC (rev 6668) @@ -1,7 +1,7 @@ === -Release 0.98.5.2 at r6665 +Release 0.98.5.3 at r6667 -2008-12-18 Removed configobj and experimental traits - JDH +2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH 2008-12-18 Fix bug where a line with NULL data limits prevents subsequent data limits from calculating correctly - MGD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6669] trunk/matplotlib
Revision: 6669
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6669&view=rev
Author: jdh2358
Date: 2008-12-18 17:32:22 + (Thu, 18 Dec 2008)
Log Message:
---
Merged revisions 6665-6668 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint
r6665 | jdh2358 | 2008-12-18 08:29:51 -0800 (Thu, 18 Dec 2008) | 1 line
removed some configobj and traits detritus
r | jdh2358 | 2008-12-18 08:31:44 -0800 (Thu, 18 Dec 2008) | 1 line
tagging release 0.98.5.2
r6667 | jdh2358 | 2008-12-18 09:02:41 -0800 (Thu, 18 Dec 2008) | 1 line
removed mpl_data
r6668 | jdh2358 | 2008-12-18 09:03:47 -0800 (Thu, 18 Dec 2008) | 1 line
retagging for 98.5.2
Modified Paths:
--
trunk/matplotlib/CHANGELOG
trunk/matplotlib/doc/api/api_changes.rst
trunk/matplotlib/setup.py
trunk/matplotlib/setupext.py
Removed Paths:
-
trunk/matplotlib/doc/mpl_data
Property Changed:
trunk/matplotlib/
Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6662
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6668
Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG 2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/CHANGELOG 2008-12-18 17:32:22 UTC (rev 6669)
@@ -1,5 +1,10 @@
2008-12-18 add new arrow style, a line + filled triangles. -JJL
+==
+2008-12-18 Released 0.98.5.2 from v0_98_5_maint at r6667
+
+2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH
+
2008-12-18 Fix bug where a line with NULL data limits prevents
subsequent data limits from calculating correctly - MGD
Modified: trunk/matplotlib/doc/api/api_changes.rst
===
--- trunk/matplotlib/doc/api/api_changes.rst2008-12-18 17:03:47 UTC (rev
6668)
+++ trunk/matplotlib/doc/api/api_changes.rst2008-12-18 17:32:22 UTC (rev
6669)
@@ -15,6 +15,7 @@
Changes for 0.98.x
==
+* Removed the configobj and experiemtnal traits rc support
* Modified :func:`matplotlib.mlab.psd`, :func:`matplotlib.mlab.csd`,
:func:`matplotlib.mlab.cohere`, and :func:`matplotlib.mlab.specgram`
Deleted: trunk/matplotlib/doc/mpl_data
===
--- trunk/matplotlib/doc/mpl_data 2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/doc/mpl_data 2008-12-18 17:32:22 UTC (rev 6669)
@@ -1 +0,0 @@
-link ../lib/matplotlib/mpl-data/
\ No newline at end of file
Modified: trunk/matplotlib/setup.py
===
--- trunk/matplotlib/setup.py 2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/setup.py 2008-12-18 17:32:22 UTC (rev 6669)
@@ -35,12 +35,12 @@
from distutils.core import setup
from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
build_macosx, build_ft2font, build_image, build_windowing, build_path, \
- build_contour, build_delaunay, build_nxutils, build_traits, build_gdk, \
+ build_contour, build_delaunay, build_nxutils, build_gdk, \
build_ttconv, print_line, print_status, print_message, \
print_raw, check_for_freetype, check_for_libpng, check_for_gtk, \
check_for_tk, check_for_wx, check_for_macosx, check_for_numpy, \
- check_for_qt, check_for_qt4, check_for_cairo, check_for_traits, \
- check_provide_pytz, check_provide_dateutil, check_for_configobj, \
+ check_for_qt, check_for_qt4, check_for_cairo, \
+ check_provide_pytz, check_provide_dateutil,\
check_for_dvipng, check_for_ghostscript, check_for_latex, \
check_for_pdftops, check_for_datetime, options, build_png
#import distutils.sysconfig
@@ -217,15 +217,7 @@
check_for_latex()
check_for_pdftops()
-# TODO: comment out for mpl release:
print_raw("")
-print_raw("EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES")
-has_configobj = check_for_configobj()
-has_traits = check_for_traits()
-if has_configobj and has_traits:
-packages.append('matplotlib.config')
-
-print_raw("")
print_raw("[Edit setup.cfg to suppress the above messages]")
print_line()
Modified: trunk/matplotlib/setupext.py
===
--- trunk/matplotlib/setupext.py2008-12-18 17:03:47 UTC (rev 6668)
+++ trunk/matplotlib/setupext.py2008-12-18 17:32:22 UTC (rev 6669)
@@ -83,7 +83,6 @@
BUILT_CONTOUR = False
BUILT_DELAUNAY = False
BUILT_NXUTILS = False
-BUILT_TRAITS= False
BUILT_CONTOUR = False
BUILT_GDK = False
BUILT_PATH = False
@@ -434,36 +433,6 @@
SF.net SVN: matplotlib:[6670] trunk/matplotlib/release/osx
Revision: 6670
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6670&view=rev
Author: jdh2358
Date: 2008-12-18 17:40:19 + (Thu, 18 Dec 2008)
Log Message:
---
updates to osx makefile
Modified Paths:
--
trunk/matplotlib/release/osx/Makefile
trunk/matplotlib/release/osx/data/setup.cfg
Modified: trunk/matplotlib/release/osx/Makefile
===
--- trunk/matplotlib/release/osx/Makefile 2008-12-18 17:32:22 UTC (rev
6669)
+++ trunk/matplotlib/release/osx/Makefile 2008-12-18 17:40:19 UTC (rev
6670)
@@ -2,7 +2,7 @@
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
FREETYPEVERSION=2.3.7
-MPLVERSION=0.98.5.1
+MPLVERSION=0.98.5.2
MPLSRC=matplotlib-${MPLVERSION}
MACOSX_DEPLOYMENT_TARGET=10.4
@@ -91,8 +91,16 @@
cd dist && \
zip -ro matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip
matplotlib-${MPLVERSION}-py2.5-macosx10.5.mpkg
+upload:
+ rm -rf upload &&\
+ mkdir upload &&\
+ cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
+ cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py2.5-macosx-10.5-i386.egg
upload/matplotlib-${MPLVERSION}-py2.5.egg &&\
+ cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip
upload/matplotlib-${MPLVERSION}-py2.5-mpkg.zip&&\
+ scp upload/* [email protected]:uploads/
+
all:
- make clean fetch_deps dependencies installers
+ make clean fetch_deps dependencies installers upload
Modified: trunk/matplotlib/release/osx/data/setup.cfg
===
--- trunk/matplotlib/release/osx/data/setup.cfg 2008-12-18 17:32:22 UTC (rev
6669)
+++ trunk/matplotlib/release/osx/data/setup.cfg 2008-12-18 17:40:19 UTC (rev
6670)
@@ -25,6 +25,11 @@
pytz = True
dateutil = True
+## Experimental config package support, this should only be enabled by
+## matplotlib developers, for matplotlib development
+enthought.traits = False
+configobj = False
+
[gui_support]
# Matplotlib supports multiple GUI toolkits, including Cocoa,
# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you. Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6671] trunk/matplotlib/release/osx/data/setup.cfg
Revision: 6671 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6671&view=rev Author: jdh2358 Date: 2008-12-18 17:41:11 + (Thu, 18 Dec 2008) Log Message: --- removed references to configobj and traits from setup.cfg Modified Paths: -- trunk/matplotlib/release/osx/data/setup.cfg Modified: trunk/matplotlib/release/osx/data/setup.cfg === --- trunk/matplotlib/release/osx/data/setup.cfg 2008-12-18 17:40:19 UTC (rev 6670) +++ trunk/matplotlib/release/osx/data/setup.cfg 2008-12-18 17:41:11 UTC (rev 6671) @@ -25,10 +25,6 @@ pytz = True dateutil = True -## Experimental config package support, this should only be enabled by -## matplotlib developers, for matplotlib development -enthought.traits = False -configobj = False [gui_support] # Matplotlib supports multiple GUI toolkits, including Cocoa, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6672] branches/v0_98_5_maint
Revision: 6672
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6672&view=rev
Author: mdboom
Date: 2008-12-18 19:07:08 + (Thu, 18 Dec 2008)
Log Message:
---
Fix how example files are added to the build. Saves about 1MB in html output.
Modified Paths:
--
branches/v0_98_5_maint/doc/conf.py
branches/v0_98_5_maint/doc/make.py
branches/v0_98_5_maint/doc/sphinxext/plot_directive.py
branches/v0_98_5_maint/lib/matplotlib/pyplot.py
Added Paths:
---
branches/v0_98_5_maint/doc/sphinxext/gen_rst.py
Modified: branches/v0_98_5_maint/doc/conf.py
===
--- branches/v0_98_5_maint/doc/conf.py 2008-12-18 17:41:11 UTC (rev 6671)
+++ branches/v0_98_5_maint/doc/conf.py 2008-12-18 19:07:08 UTC (rev 6672)
@@ -29,7 +29,7 @@
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['mathmpl', 'math_symbol_table', 'sphinx.ext.autodoc',
'only_directives', 'plot_directive', 'inheritance_diagram',
- 'gen_gallery']
+ 'gen_gallery', 'gen_rst']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Modified: branches/v0_98_5_maint/doc/make.py
===
--- branches/v0_98_5_maint/doc/make.py 2008-12-18 17:41:11 UTC (rev 6671)
+++ branches/v0_98_5_maint/doc/make.py 2008-12-18 19:07:08 UTC (rev 6672)
@@ -34,15 +34,12 @@
def html():
check_build()
-if not os.path.exists('examples/index.rst'):
-examples()
shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc',
'_static/matplotlibrc')
-#figs()
if small_docs:
options = "-D plot_formats=\"['png']\""
else:
options = ''
-if os.system('sphinx-build %s -b html -d build/doctrees . build/html' %
options):
+if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' %
options):
raise SystemExit("Building HTML failed.")
figures_dest_path = 'build/html/pyplots'
Copied: branches/v0_98_5_maint/doc/sphinxext/gen_rst.py (from rev 6660,
branches/v0_98_5_maint/doc/examples/gen_rst.py)
===
--- branches/v0_98_5_maint/doc/sphinxext/gen_rst.py
(rev 0)
+++ branches/v0_98_5_maint/doc/sphinxext/gen_rst.py 2008-12-18 19:07:08 UTC
(rev 6672)
@@ -0,0 +1,155 @@
+"""
+generate the rst files for the examples by iterating over the pylab examples
+"""
+import os, glob
+
+import os
+import re
+import sys
+fileList = []
+
+def out_of_date(original, derived):
+"""
+Returns True if derivative is out-of-date wrt original,
+both of which are full file paths.
+
+TODO: this check isn't adequate in some cases. Eg, if we discover
+a bug when building the examples, the original and derived will be
+unchanged but we still want to force a rebuild.
+"""
+return (not os.path.exists(derived) or
+os.stat(derived).st_mtime < os.stat(original).st_mtime)
+
+noplot_regex = re.compile(r"#\s*-\*-\s*noplot\s*-\*-")
+
+def generate_example_rst(app):
+rootdir = os.path.join(app.builder.srcdir, 'mpl_examples')
+exampledir = os.path.join(app.builder.srcdir, 'examples')
+if not os.path.exists(exampledir):
+os.makedirs(exampledir)
+
+datad = {}
+for root, subFolders, files in os.walk(rootdir):
+for fname in files:
+if ( fname.startswith('.') or fname.startswith('#') or
fname.startswith('_') or
+ fname.find('.svn')>=0 or not fname.endswith('.py') ):
+continue
+
+fullpath = os.path.join(root,fname)
+contents = file(fullpath).read()
+# indent
+relpath = os.path.split(root)[-1]
+datad.setdefault(relpath, []).append((fullpath, fname, contents))
+
+subdirs = datad.keys()
+subdirs.sort()
+
+fhindex = file(os.path.join(exampledir, 'index.rst'), 'w')
+fhindex.write("""\
+.. _examples-index:
+
+
+Matplotlib Examples
+
+
+.. htmlonly::
+
+:Release: |version|
+:Date: |today|
+
+.. toctree::
+:maxdepth: 2
+
+""")
+
+for subdir in subdirs:
+rstdir = os.path.join(exampledir, subdir)
+if not os.path.exists(rstdir):
+os.makedirs(rstdir)
+
+outputdir = os.path.join(app.builder.outdir, 'examples')
+if not os.path.exists(outputdir):
+os.makedirs(outputdir)
+
+outputdir = os.path.join(outputdir, subdir)
+if not os.path.exists(outputdir):
+os.makedirs(outputdir)
+
+subdirIndexFile = os.path.join(rstdir, 'index.rst')
+fhsubdirIndex = file(subdirIndexFile, 'w')
+fhindex.write('%s/index.rst\n\n'%subdir)
+
+fhsubdirIndex.write("""\
+.. _%s-examples-index:
+
+##
SF.net SVN: matplotlib:[6673] branches/v0_98_5_maint/doc/examples/
Revision: 6673 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6673&view=rev Author: mdboom Date: 2008-12-18 19:08:45 + (Thu, 18 Dec 2008) Log Message: --- removing examples from svn Removed Paths: - branches/v0_98_5_maint/doc/examples/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6674] trunk/matplotlib
Revision: 6674
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6674&view=rev
Author: mdboom
Date: 2008-12-18 19:10:38 + (Thu, 18 Dec 2008)
Log Message:
---
Merged revisions 6672-6673 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint
r6672 | mdboom | 2008-12-18 14:07:08 -0500 (Thu, 18 Dec 2008) | 2 lines
Fix how example files are added to the build. Saves about 1MB in html output.
r6673 | mdboom | 2008-12-18 14:08:45 -0500 (Thu, 18 Dec 2008) | 1 line
removing examples from svn
Modified Paths:
--
trunk/matplotlib/doc/conf.py
trunk/matplotlib/doc/make.py
trunk/matplotlib/doc/sphinxext/plot_directive.py
trunk/matplotlib/lib/matplotlib/pyplot.py
Added Paths:
---
trunk/matplotlib/doc/sphinxext/gen_rst.py
Removed Paths:
-
trunk/matplotlib/doc/examples/
Property Changed:
trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
- /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6668
+ /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6673
Modified: svn:mergeinfo
- /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662
+ /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673
Modified: trunk/matplotlib/doc/conf.py
===
--- trunk/matplotlib/doc/conf.py2008-12-18 19:08:45 UTC (rev 6673)
+++ trunk/matplotlib/doc/conf.py2008-12-18 19:10:38 UTC (rev 6674)
@@ -29,7 +29,7 @@
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['mathmpl', 'math_symbol_table', 'sphinx.ext.autodoc',
'only_directives', 'plot_directive', 'inheritance_diagram',
- 'gen_gallery']
+ 'gen_gallery', 'gen_rst']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Modified: trunk/matplotlib/doc/make.py
===
--- trunk/matplotlib/doc/make.py2008-12-18 19:08:45 UTC (rev 6673)
+++ trunk/matplotlib/doc/make.py2008-12-18 19:10:38 UTC (rev 6674)
@@ -34,15 +34,12 @@
def html():
check_build()
-if not os.path.exists('examples/index.rst'):
-examples()
shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc',
'_static/matplotlibrc')
-#figs()
if small_docs:
options = "-D plot_formats=\"['png']\""
else:
options = ''
-if os.system('sphinx-build %s -b html -d build/doctrees . build/html' %
options):
+if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' %
options):
raise SystemExit("Building HTML failed.")
figures_dest_path = 'build/html/pyplots'
Property changes on: trunk/matplotlib/doc/pyplots/README
___
Modified: svn:mergeinfo
-
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662
+
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673
Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___
Modified: svn:mergeinfo
- /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662
+ /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673
Copied: trunk/matplotlib/doc/sphinxext/gen_rst.py (from rev 6673,
branches/v0_98_5_maint/doc/sphinxext/gen_rst.py)
===
--- trunk/matplotlib/doc/sphinxext/gen_rst.py (rev 0)
+++ trunk/matplotlib/doc/sphinxext/gen_rst.py 2008-12-18 19:10:38 UTC (rev
6674)
@@ -0,0 +1,155 @@
+"""
+generate the rst files for the examples by iterating over the pylab examples
+"""
+import os, glob
+
+import os
+import re
+import sys
+fileList = []
+
+def out_of_date(original, derived):
+"""
+Returns True if derivative is out-of-date wrt original,
+both of which are full file paths.
+
+TODO: this check isn't adequate in some cases. Eg, if we discover
+a bug when building the examples, the original and derived will be
+unchanged but we still want to force a rebuild.
+"""
+return (not os.path.exists(derived) or
+os.stat(derived).st_mtime < os.stat(original).st_mtime)
+
+noplot_regex = re.compile(r"#\s*-\*-\s*noplot\s*-\*-")
+
+def
SF.net SVN: matplotlib:[6675] branches/v0_98_5_maint/doc/make.py
Revision: 6675 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6675&view=rev Author: jdh2358 Date: 2008-12-18 19:19:26 + (Thu, 18 Dec 2008) Log Message: --- fixed a small_docs bug when no args present Modified Paths: -- branches/v0_98_5_maint/doc/make.py Modified: branches/v0_98_5_maint/doc/make.py === --- branches/v0_98_5_maint/doc/make.py 2008-12-18 19:10:38 UTC (rev 6674) +++ branches/v0_98_5_maint/doc/make.py 2008-12-18 19:19:26 UTC (rev 6675) @@ -105,4 +105,5 @@ arg, funcd.keys())) func() else: +small_docs = False all() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6676] branches/v0_98_5_maint/CHANGELOG
Revision: 6676 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6676&view=rev Author: jdh2358 Date: 2008-12-18 19:28:46 + (Thu, 18 Dec 2008) Log Message: --- pushed out new 98.5.2 tarball with smalldocs fix Modified Paths: -- branches/v0_98_5_maint/CHANGELOG Modified: branches/v0_98_5_maint/CHANGELOG === --- branches/v0_98_5_maint/CHANGELOG2008-12-18 19:19:26 UTC (rev 6675) +++ branches/v0_98_5_maint/CHANGELOG2008-12-18 19:28:46 UTC (rev 6676) @@ -1,6 +1,9 @@ + === -Release 0.98.5.3 at r6667 +Re-Released 0.98.5.2 at r6675 +Release 0.98.5.2 at r6667 + 2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH 2008-12-18 Fix bug where a line with NULL data limits prevents This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6677] trunk/matplotlib
Revision: 6677 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6677&view=rev Author: jdh2358 Date: 2008-12-18 19:40:26 + (Thu, 18 Dec 2008) Log Message: --- Merged revisions 6675-6676 via svnmerge from https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint r6675 | jdh2358 | 2008-12-18 11:19:26 -0800 (Thu, 18 Dec 2008) | 1 line fixed a small_docs bug when no args present r6676 | jdh2358 | 2008-12-18 11:28:46 -0800 (Thu, 18 Dec 2008) | 1 line pushed out new 98.5.2 tarball with smalldocs fix Modified Paths: -- trunk/matplotlib/CHANGELOG trunk/matplotlib/doc/make.py Property Changed: trunk/matplotlib/ Property changes on: trunk/matplotlib ___ Modified: svnmerge-integrated - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6673 + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6676 Modified: trunk/matplotlib/CHANGELOG === --- trunk/matplotlib/CHANGELOG 2008-12-18 19:28:46 UTC (rev 6676) +++ trunk/matplotlib/CHANGELOG 2008-12-18 19:40:26 UTC (rev 6677) @@ -1,7 +1,8 @@ 2008-12-18 add new arrow style, a line + filled triangles. -JJL == -2008-12-18 Released 0.98.5.2 from v0_98_5_maint at r6667 +2008-12-18 Re-Released 0.98.5.2 from v0_98_5_maint at r6675 + Released 0.98.5.2 from v0_98_5_maint at r6667 2008-12-18 Removed configobj, experimental traits and doc/mpl_data link - JDH Modified: trunk/matplotlib/doc/make.py === --- trunk/matplotlib/doc/make.py2008-12-18 19:28:46 UTC (rev 6676) +++ trunk/matplotlib/doc/make.py2008-12-18 19:40:26 UTC (rev 6677) @@ -105,4 +105,5 @@ arg, funcd.keys())) func() else: +small_docs = False all() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada. The future of the web can't happen without you. Join us at MIX09 to help pave the way to the Next Web now. Learn more and register at http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6678] trunk/toolkits/basemap
Revision: 6678
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6678&view=rev
Author: jswhit
Date: 2008-12-18 20:20:18 + (Thu, 18 Dec 2008)
Log Message:
---
check for already installed pyshapelib
Modified Paths:
--
trunk/toolkits/basemap/Changelog
trunk/toolkits/basemap/README
trunk/toolkits/basemap/setup.cfg
trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/Changelog
===
--- trunk/toolkits/basemap/Changelog2008-12-18 19:40:26 UTC (rev 6677)
+++ trunk/toolkits/basemap/Changelog2008-12-18 20:20:18 UTC (rev 6678)
@@ -1,4 +1,6 @@
version 0.99.3 (not yet released)
+ * have setup.py check for already installed pyshapelib (just
+ like it does for httplib2 and pydap).
* Basemap will now look for it's data in BASEMAPDATA.
If that env var not set, it will fall back to it's
default location.
Modified: trunk/toolkits/basemap/README
===
--- trunk/toolkits/basemap/README 2008-12-18 19:40:26 UTC (rev 6677)
+++ trunk/toolkits/basemap/README 2008-12-18 20:20:18 UTC (rev 6678)
@@ -100,11 +100,11 @@
by running "from mpl_toolkits.basemap import Basemap" at the python
prompt.
-Basemap includes two auxilliary packages, pydap (http://pydap.org, just
-the client is included) and httplib2. By default, setup.py checks to
+Basemap includes three auxilliary packages, pydap (http://pydap.org, just
+the client is included), httplib2 and pyshapelib. By default, setup.py checks
to
see if these are already installed, and if so does not try to overwrite
them. If you get import errors related to either of these two packages,
-edit setup.cfg and set pydap and/or httplib2 to True to force
+edit setup.cfg and set pydap, httplib2 and/or pyshapelib to True to force
installation of the included versions.
4) To test, cd to the examples directory and run 'python simpletest.py'.
Modified: trunk/toolkits/basemap/setup.cfg
===
--- trunk/toolkits/basemap/setup.cfg2008-12-18 19:40:26 UTC (rev 6677)
+++ trunk/toolkits/basemap/setup.cfg2008-12-18 20:20:18 UTC (rev 6678)
@@ -2,9 +2,10 @@
# By default, basemap checks for a few dependencies and
# installs them if missing. This feature can be turned off
# by uncommenting the following lines. Acceptible values are:
-# True: install, overwrite an existing installation
+# auto: install, overwrite an existing installation
# False: do not install
# auto: install only if the package is unavailable. This
# is the default behavior
pydap = auto
httplib2 = auto
+pyshapelib = auto
Modified: trunk/toolkits/basemap/setup.py
===
--- trunk/toolkits/basemap/setup.py 2008-12-18 19:40:26 UTC (rev 6677)
+++ trunk/toolkits/basemap/setup.py 2008-12-18 20:20:18 UTC (rev 6678)
@@ -99,25 +99,6 @@
include_dirs=geos_include_dirs,
libraries=['geos_c','geos']))
-# install shapelib and dbflib.
-packages = packages + ['shapelib','dbflib']
-package_dirs['shapelib'] = os.path.join('lib','shapelib')
-package_dirs['dbflib'] = os.path.join('lib','dbflib')
-extensions = extensions + \
- [Extension("shapelibc",
-["pyshapelib/shapelib_wrap.c",
- "pyshapelib/shapelib/shpopen.c",
- "pyshapelib/shapelib/shptree.c"],
-include_dirs = ["pyshapelib/shapelib"]),
- Extension("shptree",
-["pyshapelib/shptreemodule.c"],
-include_dirs = ["pyshapelib/shapelib"]),
- Extension("dbflibc",
-["pyshapelib/dbflib_wrap.c",
- "pyshapelib/shapelib/dbfopen.c"],
-include_dirs = ["pyshapelib/shapelib"],
-define_macros = dbf_macros()) ]
-
# check setup.cfg file to see how to install auxilliary packages.
options = {}
if os.path.exists("setup.cfg"):
@@ -128,10 +109,14 @@
except: options['provide_pydap'] = 'auto'
try: options['provide_httplib2'] = config.getboolean("provide_packages",
"httplib2")
except: options['provide_httplib2'] = 'auto'
+try: options['provide_pyshapelib'] = config.getboolean("provide_packages",
"pyshapelib")
+except: options['provide_pyshapelib'] = 'auto'
else:
options['provide_pydap'] = 'auto'
options['provide_httplib2'] = 'auto'
+options['provide_pyshapelib'] = 'auto'
+
provide_pydap = options['provide_pydap']
if provide_pydap == 'auto': # install pydap stuff if not already available.
# only the client is installed (not the server).
@@ -171,16 +156,65 @@
except ImportError:
print 'httplib2 not installed, will be inst
