dev-python/matplotlib: Clean old versions up

This commit is contained in:
Michał Górny
2017-05-03 08:42:33 +02:00
parent d0367df28a
commit aacf1c95ac
8 changed files with 0 additions and 784 deletions

View File

@@ -1,26 +0,0 @@
--- setupext.py.orig 2013-08-02 09:39:43.914247832 +0200
+++ setupext.py 2013-08-02 09:40:14.785304342 +0200
@@ -749,22 +749,7 @@
return str(e) + ' Using local copy.'
def add_flags(self, ext):
- if self.found_external:
- pkg_config.setup_extension(ext, 'libagg')
- else:
- ext.include_dirs.append('agg24/include')
- agg_sources = [
- 'agg_bezier_arc.cpp',
- 'agg_curves.cpp',
- 'agg_image_filters.cpp',
- 'agg_trans_affine.cpp',
- 'agg_vcgen_contour.cpp',
- 'agg_vcgen_dash.cpp',
- 'agg_vcgen_stroke.cpp',
- 'agg_vpgen_segmentator.cpp'
- ]
- ext.sources.extend(
- os.path.join('agg24', 'src', x) for x in agg_sources)
+ pkg_config.setup_extension(ext, 'libagg', default_include_dirs=["/usr/include/agg2"])
class FreeType(SetupPackage):

View File

@@ -1,22 +0,0 @@
diff --git a/setupext.py b/setupext.py
index 7b629b6..8131bb1 100644
--- a/setupext.py
+++ b/setupext.py
@@ -674,16 +674,9 @@ class CXX(SetupPackage):
name = 'pycxx'
def check(self):
- if sys.version_info[0] >= 3:
- # There is no version of PyCXX in the wild that will work
- # with Python 3.x
- self.__class__.found_external = False
- return ("Official versions of PyCXX are not compatible with "
- "Python 3.x. Using local copy")
-
self.__class__.found_external = True
old_stdout = sys.stdout
- sys.stdout = io.BytesIO()
+ #sys.stdout = io.BytesIO()
try:
import CXX
except ImportError:

View File

@@ -1,58 +0,0 @@
From b7dfa4fa7a69d091dac0ead295d28422c4e33b45 Mon Sep 17 00:00:00 2001
From: Thomas A Caswell <tcaswell@gmail.com>
Date: Sun, 24 Jan 2016 13:05:18 -0500
Subject: [PATCH] Merge pull request #5872 from jenshnielsen/sphinx134
DOC: Fix issue with Sphinx 1.3.4
Discarded changes to .travis.yml from #5872
---
lib/matplotlib/dviread.py | 2 +-
lib/matplotlib/patches.py | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
index db6e976..1141f6a 100644
--- a/lib/matplotlib/dviread.py
+++ b/lib/matplotlib/dviread.py
@@ -841,7 +841,7 @@ def find_tex_file(filename, format=None):
"""
Call :program:`kpsewhich` to find a file in the texmf tree. If
*format* is not None, it is used as the value for the
- :option:`--format` option.
+ `--format` option.
Apparently most existing TeX distributions on Unix-like systems
use kpathsea. I hear MikTeX (a popular distribution on Windows)
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
index b8b7363..917eca7 100644
--- a/lib/matplotlib/patches.py
+++ b/lib/matplotlib/patches.py
@@ -2992,15 +2992,21 @@ class Bar(_Base):
def __init__(self, armA=0., armB=0., fraction=0.3, angle=None):
"""
- *armA* : minimum length of armA
+ Parameters
+ ----------
+ armA : float
+ minimum length of armA
- *armB* : minimum length of armB
+ armB : float
+ minimum length of armB
- *fraction* : a fraction of the distance between two points that
- will be added to armA and armB.
+ fraction : float
+ a fraction of the distance between two points that
+ will be added to armA and armB.
- *angle* : angle of the connecting line (if None, parallel to A
- and B)
+ angle : float or None
+ angle of the connecting line (if None, parallel
+ to A and B)
"""
self.armA = armA
self.armB = armB

View File

@@ -1,22 +0,0 @@
From c28e1b0aebe19b7db292eb7c1b6deba8af6754e0 Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <jens.nielsen@ucl.ac.uk>
Date: Wed, 13 Jan 2016 13:48:06 +0000
Subject: [PATCH] Fix new pep8 issue in legend_demo5
---
examples/pylab_examples/legend_demo5.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/pylab_examples/legend_demo5.py b/examples/pylab_examples/legend_demo5.py
index 699babe..5668966 100644
--- a/examples/pylab_examples/legend_demo5.py
+++ b/examples/pylab_examples/legend_demo5.py
@@ -41,7 +41,7 @@ def create_artists(self, legend, orig_handle,
lw = orig_handle.get_linewidths()[i]
except IndexError:
lw = orig_handle.get_linewidths()[0]
- if dashes[0] != None:
+ if dashes[0] is not None:
legline.set_dashes(dashes[1])
legline.set_color(color)
legline.set_transform(trans)

View File

@@ -1,115 +0,0 @@
From 72cf5b80537157decc741d81db550e6cf82648f6 Mon Sep 17 00:00:00 2001
From: Michael Droettboom <mdboom@gmail.com>
Date: Mon, 11 Jan 2016 16:48:04 -0500
Subject: [PATCH] Fix #5829. Update the baseline image.
---
.../baseline_images/test_image/rasterize_10dpi.svg | 56 ++++++++++------------
1 file changed, 26 insertions(+), 30 deletions(-)
diff --git a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
index 47e354d..1f73c8f 100644
--- a/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
+++ b/lib/matplotlib/tests/baseline_images/test_image/rasterize_10dpi.svg
@@ -5,31 +5,29 @@
<svg height="72pt" version="1.1" viewBox="0 0 216 72" width="216pt" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<style type="text/css">
-*{stroke-linecap:butt;stroke-linejoin:round;}
+*{stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:100000;}
</style>
</defs>
<g id="figure_1">
<g id="patch_1">
- <path d="
-M0 72
-L216 72
-L216 0
-L0 0
+ <path d="M 0 72
+L 216 72
+L 216 0
+L 0 0
z
" style="fill:#ffffff;"/>
</g>
<g id="axes_1">
<g id="patch_2">
- <path d="
-M27 60.6176
-L76.2353 60.6176
-L76.2353 11.3824
-L27 11.3824
+ <path d="M 27 60.617647
+L 76.235294 60.617647
+L 76.235294 11.382353
+L 27 11.382353
z
" style="fill:#ffffff;"/>
</g>
- <g clip-path="url(#pc31db6f15f)">
- <image height="50.4" id="image2c20c31ecf" width="57.6" x="27.0" xlink:href="data:image/png;base64,
+ <g clip-path="url(#p306f09a014)">
+ <image height="50.4" id="image207c5863ce" width="57.6" x="27.0" xlink:href="data:image/png;base64,
iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmFzjkKwlAAhOEvKi5FMLU2HkEQwdbSU3knL+EBLMUFQayCUaMYF55FQEsH/mYYZiZiGkA3Ydj70UlAxR/Vhv09eLfPivipuOUe69QrjcvAZLwE99CShYPsnMgWiSI0QTSfdQNcjjWHTeNLnlXLhtGgnDju2KbEV+orTqX9/+QHCXAwPEkx7O0AAAAASUVORK5CYII=" y="10.2176470588"/>
</g>
<g id="matplotlib.axis_1"/>
@@ -37,43 +35,41 @@ iVBORw0KGgoAAAANSUhEUgAAAAgAAAAHCAYAAAA1WQxeAAAABHNCSVQICAgIfAhkiAAAAIVJREFUCJmF
</g>
<g id="axes_2">
<g id="patch_3">
- <path d="
-M86.0824 64.8
-L135.318 64.8
-L135.318 7.2
-L86.0824 7.2
+ <path d="M 86.082353 64.8
+L 135.317647 64.8
+L 135.317647 7.2
+L 86.082353 7.2
z
" style="fill:#ffffff;"/>
</g>
- <image height="64.8" id="image1d9f73e233" width="136.8" x="79.2" xlink:href="data:image/png;base64,
-iVBORw0KGgoAAAANSUhEUgAAABMAAAAJCAYAAADQHRcxAAAABHNCSVQICAgIfAhkiAAAAHNJREFUKJG10kENwlAQBuH5OVQBImoBAzVQA1hABxoQUAUYqIWaqIRepqdHmoaE9AGbzGU3+U4blV/N6d0yoUnoE56HNPUV2IJ3cAYF3d4/VZArOBZgWw22RxZwALtvsAm8gecjyB57gBcwNUgpf3+N2lkBB3gBDVzLDTYAAAAASUVORK5CYII=" y="7.2"/>
+ <image height="43.2" id="image2e9ed63e7b" width="50.4" x="86.39999999999999" xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAAAcAAAAGCAYAAAAPDoR2AAAABHNCSVQICAgIfAhkiAAAAFVJREFUCJllzjEVwlAAxdDbBQUVgQUMYAADWKgONCAABRjAQk0ggSUdGPoPDFnyhjyVETrQhZ6jPNKN3tQXXem1i5F/+aEHncdxpYXmPaU7nWj6PbcBc+lWnSEOzhQAAAAASUVORK5CYII=" y="14.4"/>
<g id="matplotlib.axis_3"/>
<g id="matplotlib.axis_4"/>
</g>
<g id="axes_3">
<g id="patch_4">
- <path d="
-M145.165 64.8
-L194.4 64.8
-L194.4 7.2
-L145.165 7.2
+ <path d="M 145.164706 64.8
+L 194.4 64.8
+L 194.4 7.2
+L 145.164706 7.2
z
" style="fill:#ffffff;"/>
</g>
<g id="line2d_1">
- <path clip-path="url(#p19b1e86336)" d="
-M145.165 45.6
-L194.4 26.4" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
+ <path clip-path="url(#pef029be595)" d="M 145.164706 45.6
+L 194.4 26.4
+" style="fill:none;stroke:#0000ff;stroke-linecap:square;stroke-width:20.0;"/>
</g>
<g id="matplotlib.axis_5"/>
<g id="matplotlib.axis_6"/>
</g>
</g>
<defs>
- <clipPath id="p19b1e86336">
+ <clipPath id="pef029be595">
<rect height="57.6" width="49.2352941176" x="145.164705882" y="7.2"/>
</clipPath>
- <clipPath id="pc31db6f15f">
+ <clipPath id="p306f09a014">
<rect height="49.2352941176" width="49.2352941176" x="27.0" y="11.3823529412"/>
</clipPath>
</defs>