mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-25 21:08:35 -07:00
dev-python/matplotlib: Drop old
Package-Manager: Portage-2.3.36, Repoman-2.3.9
This commit is contained in:
Andreas Sturmlechner
@@ -1,126 +0,0 @@
|
||||
commit f98c4846dc3c15b3d24aafb973764cb9b860d935
|
||||
Author: Thomas A Caswell <tcaswell@gmail.com>
|
||||
Date: Sat Jan 10 16:10:29 2015 -0500
|
||||
|
||||
MNT : removed deprecated method/kwargs from patheffects
|
||||
|
||||
Deprecated in #2462 / 84e0063bd37c629f129d36c548e8ce3a30692cae
|
||||
|
||||
attn @pelson had to known-fail a test which was using the
|
||||
proxy renderer to verify that PathEffectRender was working
|
||||
correctly.
|
||||
|
||||
diff --git a/lib/matplotlib/patheffects.py b/lib/matplotlib/patheffects.py
|
||||
index 13f8ce0..19e1c4a 100644
|
||||
--- a/lib/matplotlib/patheffects.py
|
||||
+++ b/lib/matplotlib/patheffects.py
|
||||
@@ -10,9 +10,7 @@ from __future__ import (absolute_import, division, print_function,
|
||||
import six
|
||||
|
||||
from matplotlib.backend_bases import RendererBase
|
||||
-from matplotlib.backends.backend_mixed import MixedModeRenderer
|
||||
import matplotlib.transforms as mtransforms
|
||||
-import matplotlib.cbook as cbook
|
||||
from matplotlib.colors import colorConverter
|
||||
import matplotlib.patches as mpatches
|
||||
|
||||
@@ -42,12 +40,6 @@ class AbstractPathEffect(object):
|
||||
return transform + self._offset_trans.clear().translate(offset_x,
|
||||
offset_y)
|
||||
|
||||
- def get_proxy_renderer(self, renderer):
|
||||
- """Return a PathEffectRenderer instance for this PathEffect."""
|
||||
- cbook.deprecated('v1.4', name='get_proxy_renderer',
|
||||
- alternative='PathEffectRenderer')
|
||||
- return PathEffectRenderer([self], renderer)
|
||||
-
|
||||
def _update_gc(self, gc, new_gc_dict):
|
||||
"""
|
||||
Update the given GraphicsCollection with the given
|
||||
@@ -219,9 +211,9 @@ class withStroke(Stroke):
|
||||
|
||||
class SimplePatchShadow(AbstractPathEffect):
|
||||
"""A simple shadow via a filled patch."""
|
||||
- def __init__(self, offset=(2,-2),
|
||||
- shadow_rgbFace=None, alpha=None, patch_alpha=None,
|
||||
- rho=0.3, offset_xy=None, **kwargs):
|
||||
+ def __init__(self, offset=(2, -2),
|
||||
+ shadow_rgbFace=None, alpha=None,
|
||||
+ rho=0.3, **kwargs):
|
||||
"""
|
||||
Parameters
|
||||
----------
|
||||
@@ -241,24 +233,12 @@ class SimplePatchShadow(AbstractPathEffect):
|
||||
:meth:`AbstractPathEffect._update_gc`.
|
||||
|
||||
"""
|
||||
- if offset_xy is not None:
|
||||
- cbook.deprecated('v1.4', 'The offset_xy keyword is deprecated. '
|
||||
- 'Use the offset keyword instead.')
|
||||
- offset = offset_xy
|
||||
super(SimplePatchShadow, self).__init__(offset)
|
||||
|
||||
if shadow_rgbFace is None:
|
||||
self._shadow_rgbFace = shadow_rgbFace
|
||||
else:
|
||||
self._shadow_rgbFace = colorConverter.to_rgba(shadow_rgbFace)
|
||||
- if patch_alpha is not None:
|
||||
- cbook.deprecated('v1.4', 'The patch_alpha keyword is deprecated. '
|
||||
- 'Use the alpha keyword instead. Transform your '
|
||||
- 'patch_alpha by alpha = 1 - patch_alpha')
|
||||
- if alpha is not None:
|
||||
- raise ValueError("Both alpha and patch_alpha were set. "
|
||||
- "Just use alpha.")
|
||||
- alpha = 1 - patch_alpha
|
||||
|
||||
if alpha is None:
|
||||
alpha = 0.3
|
||||
diff --git a/lib/matplotlib/tests/test_patheffects.py b/lib/matplotlib/tests/test_patheffects.py
|
||||
index 8298ceb..5af71e5 100644
|
||||
--- a/lib/matplotlib/tests/test_patheffects.py
|
||||
+++ b/lib/matplotlib/tests/test_patheffects.py
|
||||
@@ -5,7 +5,8 @@ import six
|
||||
|
||||
import numpy as np
|
||||
|
||||
-from matplotlib.testing.decorators import image_comparison, cleanup
|
||||
+from matplotlib.testing.decorators import (image_comparison, cleanup,
|
||||
+ knownfailureif)
|
||||
import matplotlib.pyplot as plt
|
||||
import matplotlib.patheffects as path_effects
|
||||
|
||||
@@ -84,19 +85,7 @@ def test_patheffect3():
|
||||
|
||||
|
||||
@cleanup
|
||||
-def test_PathEffect_get_proxy():
|
||||
- pe = path_effects.AbstractPathEffect()
|
||||
- fig = plt.gcf()
|
||||
- renderer = fig.canvas.get_renderer()
|
||||
-
|
||||
- with mock.patch('matplotlib.cbook.deprecated') as dep:
|
||||
- proxy_renderer = pe.get_proxy_renderer(renderer)
|
||||
- assert_equal(proxy_renderer._renderer, renderer)
|
||||
- assert_equal(proxy_renderer._path_effects, [pe])
|
||||
- dep.assert_called()
|
||||
-
|
||||
-
|
||||
-@cleanup
|
||||
+@knownfailureif(True)
|
||||
def test_PathEffect_points_to_pixels():
|
||||
fig = plt.figure(dpi=150)
|
||||
p1, = plt.plot(range(10))
|
||||
@@ -116,11 +105,9 @@ def test_PathEffect_points_to_pixels():
|
||||
pe_renderer.points_to_pixels(15))
|
||||
|
||||
|
||||
-def test_SimplePatchShadow_offset_xy():
|
||||
- with mock.patch('matplotlib.cbook.deprecated') as dep:
|
||||
- pe = path_effects.SimplePatchShadow(offset_xy=(4, 5))
|
||||
+def test_SimplePatchShadow_offset():
|
||||
+ pe = path_effects.SimplePatchShadow(offset=(4, 5))
|
||||
assert_equal(pe._offset, (4, 5))
|
||||
- dep.assert_called()
|
||||
|
||||
|
||||
@image_comparison(baseline_images=['collection'])
|
||||
@@ -1,50 +0,0 @@
|
||||
https://github.com/matplotlib/matplotlib/pull/4430
|
||||
|
||||
From 08d26a80859023963bc2ffb41a0b6aed942685a9 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@chromium.org>
|
||||
Date: Fri, 15 May 2015 03:36:45 -0400
|
||||
Subject: [PATCH 1/3] setupext: respect $PKG_CONFIG
|
||||
|
||||
When cross-compiling, it is common to set the PKG_CONFIG env var to a
|
||||
custom pkg-config that knows about the target. Make sure we respect
|
||||
that just like the standard pkg-config tools suggest (pkg.m4). If it
|
||||
isn't set, we use the same default as today -- "pkg-config".
|
||||
---
|
||||
setupext.py | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index 80b2a6c..29cddf9 100755
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -253,7 +253,8 @@ class PkgConfig(object):
|
||||
self.has_pkgconfig = False
|
||||
else:
|
||||
self.set_pkgconfig_path()
|
||||
- status, output = getstatusoutput("pkg-config --help")
|
||||
+ self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
+ status, output = getstatusoutput("%s --help" % self.pkgconfig)
|
||||
self.has_pkgconfig = (status == 0)
|
||||
if not self.has_pkgconfig:
|
||||
print("IMPORTANT WARNING:")
|
||||
@@ -286,7 +287,7 @@ class PkgConfig(object):
|
||||
|
||||
executable = alt_exec
|
||||
if self.has_pkgconfig:
|
||||
- executable = 'pkg-config {0}'.format(package)
|
||||
+ executable = '%s %s' % (self.pkgconfig, package)
|
||||
|
||||
use_defaults = True
|
||||
|
||||
@@ -330,7 +331,7 @@ class PkgConfig(object):
|
||||
return None
|
||||
|
||||
status, output = getstatusoutput(
|
||||
- "pkg-config %s --modversion" % (package))
|
||||
+ '%s %s --modversion' % (self.pkgconfig, package))
|
||||
if status == 0:
|
||||
return output
|
||||
return None
|
||||
--
|
||||
2.4.0
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
https://github.com/matplotlib/matplotlib/pull/4430
|
||||
|
||||
From 3761303016cab0542891374032eca87e74d585bf Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@chromium.org>
|
||||
Date: Fri, 15 May 2015 03:43:17 -0400
|
||||
Subject: [PATCH 2/3] setupext: do not mess with PKG_CONFIG_PATH
|
||||
|
||||
The current code always sets PKG_CONFIG_PATH to build paths in / which
|
||||
breaks cross-compiling -- things like /usr/lib are for the build system
|
||||
(e.g. x86) and not for the target (e.g. arm). Since we're adding paths
|
||||
that are already the default for pkg-config, there's no point in trying
|
||||
to be smart here. Just punt the code.
|
||||
|
||||
This basically reverts commit 101beb975d3a1218350f02bf68dc2a43ac8ff148.
|
||||
---
|
||||
setupext.py | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index 29cddf9..57d80e7 100755
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -252,7 +252,6 @@ class PkgConfig(object):
|
||||
if sys.platform == 'win32':
|
||||
self.has_pkgconfig = False
|
||||
else:
|
||||
- self.set_pkgconfig_path()
|
||||
self.pkgconfig = os.environ.get('PKG_CONFIG', 'pkg-config')
|
||||
status, output = getstatusoutput("%s --help" % self.pkgconfig)
|
||||
self.has_pkgconfig = (status == 0)
|
||||
@@ -262,20 +261,6 @@ class PkgConfig(object):
|
||||
" pkg-config is not installed.\n"
|
||||
" matplotlib may not be able to find some of its dependencies")
|
||||
|
||||
- def set_pkgconfig_path(self):
|
||||
- pkgconfig_path = sysconfig.get_config_var('LIBDIR')
|
||||
- if pkgconfig_path is None:
|
||||
- return
|
||||
-
|
||||
- pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
|
||||
- if not os.path.isdir(pkgconfig_path):
|
||||
- return
|
||||
-
|
||||
- try:
|
||||
- os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
|
||||
- except KeyError:
|
||||
- os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
|
||||
-
|
||||
def setup_extension(self, ext, package, default_include_dirs=[],
|
||||
default_library_dirs=[], default_libraries=[],
|
||||
alt_exec=None):
|
||||
--
|
||||
2.4.0
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
https://github.com/matplotlib/matplotlib/pull/4430
|
||||
|
||||
From d077e49be318c851f6bbd64708efeed78a3ece3f Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@chromium.org>
|
||||
Date: Fri, 15 May 2015 03:49:02 -0400
|
||||
Subject: [PATCH 3/3] setupext: do not hardcode system -I/-L paths
|
||||
|
||||
The native compiler should already know the right paths to look for
|
||||
includes and libraries. Hardcoding a specific list of those paths
|
||||
breaks both cross-compiling and multilib. In the former, paths like
|
||||
/usr/include and /usr/lib are for x86 but when you want to build for
|
||||
arm, mixing them leads to bad failures. In the latter, paths like
|
||||
/usr/lib typically hold 32it libraries, but when you're building for
|
||||
64bit, you want the libs from /usr/lib64. This goes even further as
|
||||
there are other mixed ABIs like /usr/libx32 and /usr/lib32, neither
|
||||
of which are handled here.
|
||||
|
||||
Instead, delete the code entirely and rely on the compiler being
|
||||
properly configured. If you want to use a misconfigured compiler,
|
||||
you can always set CFLAGS/CPPFLAGS/LDFLAGS to include the -I/-L
|
||||
that your system needs.
|
||||
---
|
||||
setupext.py | 12 +-----------
|
||||
1 file changed, 1 insertion(+), 11 deletions(-)
|
||||
|
||||
diff --git a/setupext.py b/setupext.py
|
||||
index 57d80e7..7473e3a 100755
|
||||
--- a/setupext.py
|
||||
+++ b/setupext.py
|
||||
@@ -216,9 +216,7 @@ sysconfig.customize_compiler = my_customize_compiler
|
||||
|
||||
def make_extension(name, files, *args, **kwargs):
|
||||
"""
|
||||
- Make a new extension. Automatically sets include_dirs and
|
||||
- library_dirs to the base directories appropriate for this
|
||||
- platform.
|
||||
+ Make a new extension.
|
||||
|
||||
`name` is the name of the extension.
|
||||
|
||||
@@ -228,14 +226,6 @@ def make_extension(name, files, *args, **kwargs):
|
||||
`distutils.core.Extension` constructor.
|
||||
"""
|
||||
ext = DelayedExtension(name, files, *args, **kwargs)
|
||||
- for dir in get_base_dirs():
|
||||
- include_dir = os.path.join(dir, 'include')
|
||||
- if os.path.exists(include_dir):
|
||||
- ext.include_dirs.append(include_dir)
|
||||
- for lib in ('lib', 'lib64'):
|
||||
- lib_dir = os.path.join(dir, lib)
|
||||
- if os.path.exists(lib_dir):
|
||||
- ext.library_dirs.append(lib_dir)
|
||||
ext.include_dirs.append('.')
|
||||
|
||||
return ext
|
||||
--
|
||||
2.4.0
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
diff -r -U2 matplotlib-2.1.2.orig/doc/conf.py matplotlib-2.1.2/doc/conf.py
|
||||
--- matplotlib-2.1.2.orig/doc/conf.py 2018-01-19 11:07:49.000000000 +0700
|
||||
+++ matplotlib-2.1.2/doc/conf.py 2018-01-21 20:06:44.120901546 +0700
|
||||
@@ -136,5 +136,5 @@
|
||||
}
|
||||
|
||||
-plot_gallery = 'True'
|
||||
+plot_gallery = True
|
||||
|
||||
# Add any paths that contain templates here, relative to this directory.
|
||||
Reference in New Issue
Block a user