From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- dev-python/matplotlib/Manifest | 12 +- .../matplotlib/files/matplotlib-3.1.2-qhull.patch | 20 - .../matplotlib/files/matplotlib-3.2.2-test.patch | 419 --------------------- dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild | 271 ------------- dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild | 275 -------------- dev-python/matplotlib/matplotlib-3.3.2.ebuild | 277 -------------- dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild | 2 +- dev-python/matplotlib/matplotlib-3.3.4.ebuild | 2 +- 8 files changed, 4 insertions(+), 1274 deletions(-) delete mode 100644 dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-3.2.2-test.patch delete mode 100644 dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.3.2.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 7669d4623578..9fcb23f90074 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,18 +1,10 @@ -AUX matplotlib-3.1.2-qhull.patch 768 BLAKE2B 480f213014c4f50f7926679a826e282937f25043f530f01d38ac3c4b1672b37a0cd52466bd5f6c66957de5a871b30dfea58e42a6f389a005347220e4d73cb97d SHA512 d25b5888a03b82ddf8e8d415905663e4e77041ce17fb37ac3562ba126048373abc1203acfd0643c1544f1d0ac9f3232447c3f60295daa5528346e80142848420 -AUX matplotlib-3.2.2-test.patch 16508 BLAKE2B 42ed1e5b59f3248dd0c8786769a9694e2e29dbde11d2bc8cff4dc6773663d7f777ee7e125ef9261ec10dd142b686396408d2e5a87939b74ed2c1f8c1ff0c7841 SHA512 e8689c978b7055f01ed7b996b6a25f716039c2bc146bc74cfeb8adb3e29739ddb5e0c5749b220ffb346ef95ad09dbed2339315e357c35d3a9b46d03c21a3382c AUX matplotlib-3.3.0-test.patch 9618 BLAKE2B f239d5c16be50b601c91e47e9c43c928beeaddb22be236a17244f289c9032564d3bb1e2e5bd63f6017e51d71008efbd8c86ccc96eed0d30abc50537563720271 SHA512 445076feec916e508a3673babacbf8a8372a6f05c3d067eb77584c4352387d1bc3b1dc6c76beb18549df4601b50943d271c8db510f30748dbcdfc56727030b41 AUX matplotlib-3.3.2-test-extra.patch 851 BLAKE2B 8fca758413834cf78707a42edbf878919e5d5183eac017928f12da0f9636d62ca42b1a7206e8f2131613bfa5249a835083c461c14c5be95091c37ce94902ea17 SHA512 45aaca6349269b5ab7476cbb82ba1dda6f8fa89100f7a8c7c1c5c037db1213b252daccfc5e905cb09d259f4e28d726c583d5a71f2da2421a787bb3b31fca6e5a AUX matplotlib-3.3.3-disable-lto.patch 828 BLAKE2B 2044ef633091f27080d20e3e1b2c74605e13e99c9d044e97accde3b0a7946ef656f10c9bf5c036745f8ec85380e48cfd5e3d6fe8a023fa60e408d270f45a1da5 SHA512 81562749756b0415c6ce333d3cbbc197306dc9c2c425ec761767271c974badd13fe9a497c74231cd1bf9347f03ef0593bceff9b597289a8328e7c0211c7047ed AUX matplotlib-3.3.4-test-extra.patch 481 BLAKE2B 1926876a15bd2d8b14c62404dddb0b119abde78baea3cee7dd751d0b0a21249ad1461fbba4d20823d7e754f074cbf48aaf2da317685dded99c792be9e17edb9d SHA512 7a7e0bdbd96a4f1f335eb3ee1840747045b09ba974d2614f234fa4fbc5c3e1e7c5fd154ec68a74640a916fed9e0b3d5ca01d1b22ba4f7bf3ba5f47039e67d00a DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b -DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31 -DIST matplotlib-3.3.0.tar.gz 38782487 BLAKE2B 97330d93b8d8a64a1296ccb173e44ebcc54c61e22aacdd73cc38a46fb2d22fbfe7334fb3c6993be001c475724c47f530243affddd71ec647232ac093db6e3135 SHA512 2ffd9e79e300a37092ab4b5a7156c2f57e408975818abd413c74477ad622030c7636695467aab821c9996564cddec57e26ba6a8004f6639070964fcb7a510a75 -DIST matplotlib-3.3.2.tar.gz 37939974 BLAKE2B f28e184a0fccd4192ba8135b70569bf463d08cae0f4eb8e7f997f417cb947500a9fe46eb5f979473b4d7d22c0ad03ab55aba4067082c86f63eacbf837b8606ad SHA512 cae68e63d879bcfb41b25df4de48472461f7987403d42d34c7205a65ed3ef567660309c04d2a55e155fbe1ef708fd9de0b0d66e71578f34c3ee93379c4ea1e1a DIST matplotlib-3.3.3.tar.gz 37944403 BLAKE2B 30358d7b7df87b0b15724c4eeb132acdacf31ac900d5c06b22c7ebc7217d6cabcc76b7e29cea6af0b4711b5b1724ce34dd065f63cabcfd40c0fcf9788f94c1fe SHA512 36b482a6c36ee08c47f3c02c160289bbdec8746d4d246084723bd3e1fd632c6383f6db58c950a9773a6993d10f24dacd870a91faafc34864616288cd05b6232c DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4 -EBUILD matplotlib-3.2.2-r2.ebuild 6538 BLAKE2B 01d48dd525bdf556cb63fbee4a058e00de373d3c8085d23e6b245c0b172cdf43d091e573ffb41c465d63bfb291c7e78cfcdfda0026325042b73219113dbdfdaa SHA512 34a88f01540b049952482a7a57fa5150f92cba167904f909c6ce1d7830b68af755d7c2b16c6237bfd896a8b7be3fb8a7f3ab3c6ea701cea607d770645219b54e -EBUILD matplotlib-3.3.0-r1.ebuild 6660 BLAKE2B 61c626d44eae4bf79c97d57bbe831714faea8765a5c29a887537224e98cc100deff25a68c49584d2fe99ae097ca2853661644ad03b68c1888b4141523fb5f7f4 SHA512 223d3d5dd2caa07271faf6938724bab2d838999648729440f301b265d6d65ec5b7cb82d5fca18d2df1f1fc48a7bbd26f8d4df7dc160351f33f8a263e23f53a66 -EBUILD matplotlib-3.3.2.ebuild 6776 BLAKE2B 0df0ddabcef2d9028af37dc1e246be9efdaaa7893b91b71b983da1e4bb5850de5bb9839d328eee5f17df2ac82718bc2a9f5895352879cbda54acad83a3658366 SHA512 37b1f1acce0215b44fb0f1dafa5d6519a0733c684e052f4963bdd78e0f91023e5e48ab89b6027ccecd24ce09399a91e28224235b45ca58bde27480bc8bbeae99 -EBUILD matplotlib-3.3.3-r1.ebuild 6914 BLAKE2B 7083fbe325ee040c96acf3c42781341d1964deec55067f9701a341977ee32cacfcc118fb765ee20ec2c8ea82de1c1dfced99c46f28316091944aee598bedc9d8 SHA512 743b404ccd3d358cc3c6aedd5ef2c5071953c14c034abbf8efcab75e2a728aef6a24acab9a7f950c525795de9dff32842922f0527679e6f41c580bb66b9d014e -EBUILD matplotlib-3.3.4.ebuild 6933 BLAKE2B 70baaf360eca8406ef11348ff9396d92474b25e3287d6cdd7af6e3208bfbc697eee201acbb6bee9abe200c8458b93cf414e17fba5f754acaca7e0d6403d25f0f SHA512 fd72ce1ae956da5f3ebebcec5e8af5d23ce247b357da45d9877e30b9b4f0b52146f82c619ee423836a6b32239e36d6902b00b8f178eb22045d7aa7f5a4ba98b2 +EBUILD matplotlib-3.3.3-r1.ebuild 6912 BLAKE2B 5f809ed5512b7e908b2daede9aac0e1ff5519140cc3553da1a781702e55eb1e8ec7428e2dfc6b2e4170559f8705c747b16e2b0bf3f1e94ac7bf7e55adea9de26 SHA512 ec81df574b7cd100de03b7851c51bda23cf2e3ac8b34ab86db91d5457c92c03aa328f557e5d61fb962ee6bb5222f2997cf25b2017628f70700184d10337cbd94 +EBUILD matplotlib-3.3.4.ebuild 6931 BLAKE2B 04c28da1a5692b7707db60e6687377f26db882a6e4d3f1cece0671c3666a17894331c0cd526c87356d16382c831058be364454e2fa8e49cdda91906028f1dfdf SHA512 f7cde7899fef918d308454ee4aec5aae5784f866a47360972cf1f2753c112b05f65f0376720d627d26cc5afa83c441c279c429451adb6775be07c72d31a7dfd0 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608 diff --git a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch b/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch deleted file mode 100644 index e02e03e65edb..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.1.2-qhull.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: matplotlib-3.1.2/setupext.py -=================================================================== ---- matplotlib-3.1.2.orig/setupext.py -+++ matplotlib-3.1.2/setupext.py -@@ -839,14 +839,7 @@ class Qhull(SetupPackage): - name = "qhull" - - def add_flags(self, ext): -- # Qhull doesn't distribute pkg-config info, so we have no way of -- # knowing whether a system install is recent enough. Thus, always use -- # the vendored version. -- ext.include_dirs.insert(0, 'extern') -- ext.sources.extend(sorted(glob.glob('extern/libqhull/*.c'))) -- if sysconfig.get_config_var('LIBM') == '-lm': -- ext.libraries.extend('m') -- -+ ext.libraries.extend(['qhull']) - - class TTConv(SetupPackage): - name = "ttconv" diff --git a/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch b/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch deleted file mode 100644 index 13755eaa33e2..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.2.2-test.patch +++ /dev/null @@ -1,419 +0,0 @@ -From 7a65dfda781777872083623595c27dc1174b2ed7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Sun, 7 Jun 2020 20:02:48 +0200 -Subject: [PATCH 1/2] Increase image comparison limits - -Most of the tests require exact match which apparently doesn't always -happen in non-pristine environments. Some of them have very big -differences due to texlive font rendering changes. ---- - lib/matplotlib/tests/test_arrow_patches.py | 4 ++-- - lib/matplotlib/tests/test_axes.py | 2 +- - lib/matplotlib/tests/test_backend_pgf.py | 7 ++++--- - lib/matplotlib/tests/test_figure.py | 2 +- - lib/matplotlib/tests/test_legend.py | 6 +++--- - lib/matplotlib/tests/test_pickle.py | 2 +- - lib/matplotlib/tests/test_units.py | 4 ++-- - lib/matplotlib/tests/test_usetex.py | 3 ++- - lib/mpl_toolkits/tests/test_axes_grid1.py | 2 +- - .../tests/test_axisartist_grid_helper_curvelinear.py | 2 +- - 10 files changed, 18 insertions(+), 16 deletions(-) - -diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py -index a9409e2c1..0e356e921 100644 ---- a/lib/matplotlib/tests/test_arrow_patches.py -+++ b/lib/matplotlib/tests/test_arrow_patches.py -@@ -67,7 +67,7 @@ def __prepare_fancyarrow_dpi_cor_test(): - - - @image_comparison(['fancyarrow_dpi_cor_100dpi.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), -+ tol={'aarch64': 0.02}.get(platform.machine(), 0.015), - savefig_kwarg=dict(dpi=100)) - def test_fancyarrow_dpi_cor_100dpi(): - """ -@@ -82,7 +82,7 @@ def test_fancyarrow_dpi_cor_100dpi(): - - - @image_comparison(['fancyarrow_dpi_cor_200dpi.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0), -+ tol={'aarch64': 0.02}.get(platform.machine(), 0.018), - savefig_kwarg=dict(dpi=200)) - def test_fancyarrow_dpi_cor_200dpi(): - """ -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 75636301d..af057d598 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -3673,7 +3673,7 @@ def test_vertex_markers(): - - - @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol={'aarch64': 0.02}.get(platform.machine(), 0.015)) - def test_eb_line_zorder(): - x = list(range(10)) - -diff --git a/lib/matplotlib/tests/test_backend_pgf.py b/lib/matplotlib/tests/test_backend_pgf.py -index 7843b4101..ddb2991c1 100644 ---- a/lib/matplotlib/tests/test_backend_pgf.py -+++ b/lib/matplotlib/tests/test_backend_pgf.py -@@ -97,7 +97,8 @@ def test_xelatex(): - # test compiling a figure to pdf with pdflatex - @needs_pdflatex - @pytest.mark.backend('pgf') --@image_comparison(['pgf_pdflatex.pdf'], style='default') -+@image_comparison(['pgf_pdflatex.pdf'], style='default', -+ tol=11.669) - def test_pdflatex(): - if os.environ.get('APPVEYOR', False): - pytest.xfail("pdflatex test does not work on appveyor due to missing " -@@ -133,7 +134,7 @@ def test_rcupdate(): - 'pgf.preamble': ['\\usepackage[utf8x]{inputenc}', - '\\usepackage[T1]{fontenc}', - '\\usepackage{sfmath}']}] -- tol = [6, 0] -+ tol = [6, 14] - for i, rc_set in enumerate(rc_sets): - with mpl.rc_context(rc_set): - create_figure() -@@ -161,7 +162,7 @@ def test_pathclip(): - @needs_xelatex - @pytest.mark.backend('pgf') - @image_comparison(['pgf_mixedmode.pdf'], style='default', -- tol={'aarch64': 1.086}.get(platform.machine(), 0.0)) -+ tol=1.086) - def test_mixedmode(): - rc_xelatex = {'font.family': 'serif', - 'pgf.rcfonts': False} -diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py -index b5ca0ed5b..885afa5f8 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -14,7 +14,7 @@ import pytest - - - @image_comparison(['figure_align_labels'], -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_align_labels(): - # Check the figure.align_labels() command - fig = plt.figure(tight_layout=True) -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 71499da44..a8bda6e84 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -106,7 +106,7 @@ def test_multiple_keys(): - - - @image_comparison(['rgba_alpha.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_alpha_rgba(): - import matplotlib.pyplot as plt - -@@ -117,7 +117,7 @@ def test_alpha_rgba(): - - - @image_comparison(['rcparam_alpha.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_alpha_rcparam(): - import matplotlib.pyplot as plt - -@@ -145,7 +145,7 @@ def test_fancy(): - - - @image_comparison(['framealpha'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_framealpha(): - x = np.linspace(1, 100, 100) - y = x -diff --git a/lib/matplotlib/tests/test_pickle.py b/lib/matplotlib/tests/test_pickle.py -index 0fad3cdf2..4d2599607 100644 ---- a/lib/matplotlib/tests/test_pickle.py -+++ b/lib/matplotlib/tests/test_pickle.py -@@ -41,7 +41,7 @@ def test_simple(): - - - @image_comparison(['multi_pickle.png'], remove_text=True, style='mpl20', -- tol={'aarch64': 0.082}.get(platform.machine(), 0.0)) -+ tol=0.082) - def test_complete(): - fig = plt.figure('Figure with a label?', figsize=(10, 6)) - -diff --git a/lib/matplotlib/tests/test_units.py b/lib/matplotlib/tests/test_units.py -index f14425144..7f744da47 100644 ---- a/lib/matplotlib/tests/test_units.py -+++ b/lib/matplotlib/tests/test_units.py -@@ -74,7 +74,7 @@ def quantity_converter(): - # Tests that the conversion machinery works properly for classes that - # work as a facade over numpy arrays (like pint) - @image_comparison(['plot_pint.png'], remove_text=False, style='mpl20', -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol={'aarch64': 0.02}.get(platform.machine(), 0.002)) - def test_numpy_facade(quantity_converter): - # use former defaults to match existing baseline image - plt.rcParams['axes.formatter.limits'] = -7, 7 -@@ -101,7 +101,7 @@ def test_numpy_facade(quantity_converter): - - # Tests gh-8908 - @image_comparison(['plot_masked_units.png'], remove_text=True, style='mpl20', -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_plot_masked_units(): - data = np.linspace(-5, 5) - data_masked = np.ma.array(data, mask=(data > -2) & (data < 2)) -diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py -index ec693288e..8af6b69eb 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -15,7 +15,8 @@ if not mpl.checkdep_usetex(True): - @image_comparison( - baseline_images=['test_usetex'], - extensions=['pdf', 'png'], -- style="mpl20") -+ style="mpl20", -+ tol=21) - def test_usetex(): - mpl.rcParams['text.usetex'] = True - fig = plt.figure() -diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py -index 9ed9a9280..56a3bd14a 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -343,7 +343,7 @@ def test_zooming_with_inverted_axes(): - - - @image_comparison(['anchored_direction_arrows.png'], -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ tol=0.02) - def test_anchored_direction_arrows(): - fig, ax = plt.subplots() - ax.imshow(np.zeros((10, 10)), interpolation='nearest') -diff --git a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py -index 611908063..dc294aef5 100644 ---- a/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py -+++ b/lib/mpl_toolkits/tests/test_axisartist_grid_helper_curvelinear.py -@@ -17,7 +17,7 @@ from mpl_toolkits.axisartist.grid_helper_curvelinear import \ - - - @image_comparison(['custom_transform.png'], style='default', -- tol={'aarch64': 0.034}.get(platform.machine(), 0.03)) -+ tol=0.034) - def test_custom_transform(): - class MyTransform(Transform): - input_dims = 2 --- -2.27.0 - -From 506611e80a4fd12b3f633583d20119fc2f096ba7 Mon Sep 17 00:00:00 2001 -From: Antony Lee -Date: Tue, 10 Dec 2019 11:18:24 +0100 -Subject: [PATCH 2/2] Rewrite test_cycles to avoid image comparison tests. - -They can all be reasonably written by checking the artist properties. ---- - lib/matplotlib/tests/test_cycles.py | 141 ++++++++++------------------ - 1 file changed, 51 insertions(+), 90 deletions(-) - -diff --git a/lib/matplotlib/tests/test_cycles.py b/lib/matplotlib/tests/test_cycles.py -index ee67b4e41..a340b6166 100644 ---- a/lib/matplotlib/tests/test_cycles.py -+++ b/lib/matplotlib/tests/test_cycles.py -@@ -1,6 +1,4 @@ --import platform -- --from matplotlib.testing.decorators import image_comparison -+import matplotlib as mpl - import matplotlib.pyplot as plt - import numpy as np - import pytest -@@ -8,133 +6,96 @@ import pytest - from cycler import cycler - - --@image_comparison(['color_cycle_basic.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) - def test_colorcycle_basic(): - fig, ax = plt.subplots() - ax.set_prop_cycle(cycler('color', ['r', 'g', 'y'])) -- xs = np.arange(10) -- ys = 0.25 * xs + 2 -- ax.plot(xs, ys, label='red', lw=4) -- ys = 0.45 * xs + 3 -- ax.plot(xs, ys, label='green', lw=4) -- ys = 0.65 * xs + 4 -- ax.plot(xs, ys, label='yellow', lw=4) -- ys = 0.85 * xs + 5 -- ax.plot(xs, ys, label='red2', lw=4) -- ax.legend(loc='upper left') -- -- --@image_comparison(['marker_cycle.png', 'marker_cycle.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ for _ in range(4): -+ ax.plot(range(10), range(10)) -+ assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r'] -+ -+ - def test_marker_cycle(): - fig, ax = plt.subplots() - ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) + - cycler('marker', ['.', '*', 'x'])) -- xs = np.arange(10) -- ys = 0.25 * xs + 2 -- ax.plot(xs, ys, label='red dot', lw=4, ms=16) -- ys = 0.45 * xs + 3 -- ax.plot(xs, ys, label='green star', lw=4, ms=16) -- ys = 0.65 * xs + 4 -- ax.plot(xs, ys, label='yellow x', lw=4, ms=16) -- ys = 0.85 * xs + 5 -- ax.plot(xs, ys, label='red2 dot', lw=4, ms=16) -- ax.legend(loc='upper left') -+ for _ in range(4): -+ ax.plot(range(10), range(10)) -+ assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r'] -+ assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.'] - -+ -+def test_marker_cycle_kwargs_arrays_iterators(): - fig, ax = plt.subplots() -- # Test keyword arguments, numpy arrays, and generic iterators - ax.set_prop_cycle(c=np.array(['r', 'g', 'y']), - marker=iter(['.', '*', 'x'])) -- xs = np.arange(10) -- ys = 0.25 * xs + 2 -- ax.plot(xs, ys, label='red dot', lw=4, ms=16) -- ys = 0.45 * xs + 3 -- ax.plot(xs, ys, label='green star', lw=4, ms=16) -- ys = 0.65 * xs + 4 -- ax.plot(xs, ys, label='yellow x', lw=4, ms=16) -- ys = 0.85 * xs + 5 -- ax.plot(xs, ys, label='red2 dot', lw=4, ms=16) -- ax.legend(loc='upper left') -- -- --@image_comparison(['lineprop_cycle_basic.png'], remove_text=True, -- tol={'aarch64': 0.02}.get(platform.machine(), 0.0)) -+ for _ in range(4): -+ ax.plot(range(10), range(10)) -+ assert [l.get_color() for l in ax.lines] == ['r', 'g', 'y', 'r'] -+ assert [l.get_marker() for l in ax.lines] == ['.', '*', 'x', '.'] -+ -+ - def test_linestylecycle_basic(): - fig, ax = plt.subplots() - ax.set_prop_cycle(cycler('ls', ['-', '--', ':'])) -- xs = np.arange(10) -- ys = 0.25 * xs + 2 -- ax.plot(xs, ys, label='solid', lw=4, color='k') -- ys = 0.45 * xs + 3 -- ax.plot(xs, ys, label='dashed', lw=4, color='k') -- ys = 0.65 * xs + 4 -- ax.plot(xs, ys, label='dotted', lw=4, color='k') -- ys = 0.85 * xs + 5 -- ax.plot(xs, ys, label='solid2', lw=4, color='k') -- ax.legend(loc='upper left') -- -- --@image_comparison(['fill_cycle_basic.png'], remove_text=True) -+ for _ in range(4): -+ ax.plot(range(10), range(10)) -+ assert [l.get_linestyle() for l in ax.lines] == ['-', '--', ':', '-'] -+ -+ - def test_fillcycle_basic(): - fig, ax = plt.subplots() - ax.set_prop_cycle(cycler('c', ['r', 'g', 'y']) + - cycler('hatch', ['xx', 'O', '|-']) + - cycler('linestyle', ['-', '--', ':'])) -- xs = np.arange(10) -- ys = 0.25 * xs**.5 + 2 -- ax.fill(xs, ys, label='red, xx', linewidth=3) -- ys = 0.45 * xs**.5 + 3 -- ax.fill(xs, ys, label='green, circle', linewidth=3) -- ys = 0.65 * xs**.5 + 4 -- ax.fill(xs, ys, label='yellow, cross', linewidth=3) -- ys = 0.85 * xs**.5 + 5 -- ax.fill(xs, ys, label='red2, xx', linewidth=3) -- ax.legend(loc='upper left') -- -- --@image_comparison(['fill_cycle_ignore.png'], remove_text=True) -+ for _ in range(4): -+ ax.fill(range(10), range(10)) -+ assert ([p.get_facecolor() for p in ax.patches] -+ == [mpl.colors.to_rgba(c) for c in ['r', 'g', 'y', 'r']]) -+ assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', '|-', 'xx'] -+ assert [p.get_linestyle() for p in ax.patches] == ['-', '--', ':', '-'] -+ -+ - def test_fillcycle_ignore(): - fig, ax = plt.subplots() - ax.set_prop_cycle(cycler('color', ['r', 'g', 'y']) + - cycler('hatch', ['xx', 'O', '|-']) + - cycler('marker', ['.', '*', 'D'])) -- xs = np.arange(10) -- ys = 0.25 * xs**.5 + 2 -+ t = range(10) - # Should not advance the cycler, even though there is an - # unspecified property in the cycler "marker". - # "marker" is not a Polygon property, and should be ignored. -- ax.fill(xs, ys, 'r', hatch='xx', label='red, xx') -- ys = 0.45 * xs**.5 + 3 -+ ax.fill(t, t, 'r', hatch='xx') - # Allow the cycler to advance, but specify some properties -- ax.fill(xs, ys, hatch='O', label='red, circle') -- ys = 0.65 * xs**.5 + 4 -- ax.fill(xs, ys, label='green, circle') -- ys = 0.85 * xs**.5 + 5 -- ax.fill(xs, ys, label='yellow, cross') -- ax.legend(loc='upper left') -+ ax.fill(t, t, hatch='O') -+ ax.fill(t, t) -+ ax.fill(t, t) -+ assert ([p.get_facecolor() for p in ax.patches] -+ == [mpl.colors.to_rgba(c) for c in ['r', 'r', 'g', 'y']]) -+ assert [p.get_hatch() for p in ax.patches] == ['xx', 'O', 'O', '|-'] - - --@image_comparison(['property_collision_plot.png'], remove_text=True) - def test_property_collision_plot(): - fig, ax = plt.subplots() - ax.set_prop_cycle('linewidth', [2, 4]) -+ t = range(10) - for c in range(1, 4): -- ax.plot(np.arange(10), c * np.arange(10), lw=0.1, color='k') -- ax.plot(np.arange(10), 4 * np.arange(10), color='k') -- ax.plot(np.arange(10), 5 * np.arange(10), color='k') -+ ax.plot(t, t, lw=0.1) -+ ax.plot(t, t) -+ ax.plot(t, t) -+ assert [l.get_linewidth() for l in ax.lines] == [0.1, 0.1, 0.1, 2, 4] - - --@image_comparison(['property_collision_fill.png'], remove_text=True) - def test_property_collision_fill(): - fig, ax = plt.subplots() -- xs = np.arange(10) -- ys = 0.25 * xs**.5 + 2 - ax.set_prop_cycle(linewidth=[2, 3, 4, 5, 6], facecolor='bgcmy') -+ t = range(10) - for c in range(1, 4): -- ax.fill(xs, c * ys, lw=0.1) -- ax.fill(xs, 4 * ys) -- ax.fill(xs, 5 * ys) -+ ax.fill(t, t, lw=0.1) -+ ax.fill(t, t) -+ ax.fill(t, t) -+ assert ([p.get_facecolor() for p in ax.patches] -+ == [mpl.colors.to_rgba(c) for c in 'bgcmy']) -+ assert [p.get_linewidth() for p in ax.patches] == [0.1, 0.1, 0.1, 5, 6] - - - def test_valid_input_forms(): --- -2.27.0 - diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild deleted file mode 100644 index c72b85e3e6f8..000000000000 --- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='tk?,threads(+)' - -DISTUTILS_USE_SETUPTOOLS=bdepend -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="https://matplotlib.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - test? ( - https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz - )" - -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" -IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] - >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.18.2[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}] - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/six-1.14.0[${PYTHON_USEDEP}] - dev-python/versioneer[${PYTHON_USEDEP}] - media-fonts/dejavu - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - >=www-servers/tornado-6.0.4[${PYTHON_USEDEP}] - cairo? ( - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - excel? ( - dev-python/xlwt[${PYTHON_USEDEP}] - ) - gtk3? ( - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - latex? ( - virtual/latex-base - app-text/dvipng - app-text/ghostscript-gpl - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-xetex - ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{6,7,8}) - ) -" - -BDEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - >=app-text/dvipng-1.15-r1 - >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}] - >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}] - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - >=media-gfx/graphviz-2.42.3[cairo] - ) - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -distutils_enable_tests pytest - -pkg_setup() { - unset DISPLAY # bug #278524 -} - -use_supported() { - case ${1} in - wxwidgets) - [[ ${EPYTHON} == python3.[678] ]] - ;; - esac - - return 0 -} - -use_setup() { - local uword="${2:-${1}}" - if use_supported "${1}" && use "${1}"; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.1.2-qhull.patch - "${FILESDIR}"/matplotlib-3.2.2-test.patch - ) - - # requires jupyter-nbconvert - rm lib/matplotlib/tests/test_backend_nbagg.py || die - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \ - -i lib/matplotlib/tests/test_*.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [packages] - tests = $(usex test True False) - [gui_support] - agg = True - gtk = False - gtkagg = False - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup qt5) - $(use_setup tk) - $(use_setup wxwidgets wx) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi -} - -wrap_setup() { - local MAKEOPTS=-j1 - local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - local -x MPLLOCALFREETYPE=1 - ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die - wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die -} - -python_install() { - wrap_setup distutils-r1_python_install - - # mpl_toolkits namespace - python_moduleinto mpl_toolkits - python_domodule lib/mpl_toolkits/__init__.py -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild deleted file mode 100644 index 5419196c0192..000000000000 --- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='tk?,threads(+)' - -DISTUTILS_USE_SETUPTOOLS=bdepend -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="https://matplotlib.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - test? ( - https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz - )" - -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~x86" -IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] - >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.18.2[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}] - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/six-1.14.0[${PYTHON_USEDEP}] - dev-python/versioneer[${PYTHON_USEDEP}] - media-fonts/dejavu - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - >=www-servers/tornado-6.0.4[${PYTHON_USEDEP}] - cairo? ( - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - excel? ( - dev-python/xlwt[${PYTHON_USEDEP}] - ) - gtk3? ( - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - latex? ( - virtual/latex-base - app-text/dvipng - app-text/ghostscript-gpl - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-xetex - ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{6,7,8}) - ) -" - -BDEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - >=app-text/dvipng-1.15-r1 - >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}] - >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}] - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - >=media-gfx/graphviz-2.42.3[cairo] - ) - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -distutils_enable_tests pytest - -pkg_setup() { - unset DISPLAY # bug #278524 -} - -use_supported() { - case ${1} in - wxwidgets) - [[ ${EPYTHON} == python3.[678] ]] - ;; - esac - - return 0 -} - -use_setup() { - local uword="${2:-${1}}" - if use_supported "${1}" && use "${1}"; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.3.0-test.patch - ) - - # requires jupyter-nbconvert - rm lib/matplotlib/tests/test_backend_nbagg.py || die - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \ - -i lib/matplotlib/tests/test_*.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [libs] - system_freetype = True - system_qhull = True - [packages] - tests = $(usex test True False) - [gui_support] - agg = True - gtk = False - gtkagg = False - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup qt5) - $(use_setup tk) - $(use_setup wxwidgets wx) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi -} - -wrap_setup() { - local MAKEOPTS=-j1 - local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${BUILD_DIR}"/test-setup.cfg || die - local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg - ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die - distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(verbosity=2))" || die -} - -python_install() { - wrap_setup distutils-r1_python_install - - # mpl_toolkits namespace - python_moduleinto mpl_toolkits - python_domodule lib/mpl_toolkits/__init__.py -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild deleted file mode 100644 index 84bd21b203b1..000000000000 --- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -PYTHON_REQ_USE='tk?,threads(+)' - -DISTUTILS_USE_SETUPTOOLS=bdepend -inherit distutils-r1 flag-o-matic virtualx toolchain-funcs prefix - -FT_PV=2.6.1 -DESCRIPTION="Pure python plotting library with matlab like syntax" -HOMEPAGE="https://matplotlib.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - test? ( - https://downloads.sourceforge.net/project/freetype/freetype2/${FT_PV}/freetype-${FT_PV}.tar.gz - )" - -# Main license: matplotlib -# Some modules: BSD -# matplotlib/backends/qt4_editor: MIT -# Fonts: BitstreamVera, OFL-1.1 -LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" -IUSE="cairo doc excel examples gtk3 latex qt5 tk wxwidgets" - -# internal copy of pycxx highly patched -# dev-python/pycxx -RDEPEND=" - dev-python/certifi[${PYTHON_USEDEP}] - >=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}] - >=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}] - >=dev-python/numpy-1.18.2[${PYTHON_USEDEP}] - >=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}] - >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}] - dev-python/python-dateutil:0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/six-1.14.0[${PYTHON_USEDEP}] - dev-python/versioneer[${PYTHON_USEDEP}] - media-fonts/dejavu - media-fonts/stix-fonts - media-libs/freetype:2 - media-libs/libpng:0 - >=media-libs/qhull-2013:= - >=www-servers/tornado-6.0.4[${PYTHON_USEDEP}] - cairo? ( - dev-python/cairocffi[${PYTHON_USEDEP}] - ) - excel? ( - dev-python/xlwt[${PYTHON_USEDEP}] - ) - gtk3? ( - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - latex? ( - virtual/latex-base - app-text/dvipng - app-text/ghostscript-gpl - app-text/poppler[utils] - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - dev-texlive/texlive-xetex - ) - qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - ) - wxwidgets? ( - $(python_gen_cond_dep ' - dev-python/wxpython:*[${PYTHON_USEDEP}] - ' python3_{6,7,8}) - ) -" - -BDEPEND=" - ${RDEPEND} - virtual/pkgconfig - doc? ( - >=app-text/dvipng-1.15-r1 - >=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}] - >=dev-python/ipython-1.18.2[${PYTHON_USEDEP}] - >=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}] - >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}] - >=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}] - >=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}] - dev-texlive/texlive-latexextra - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexrecommended - >=media-gfx/graphviz-2.42.3[cairo] - ) - test? ( - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/pygobject:3[cairo?,${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) -" - -# A few C++ source files are written to srcdir. -# Other than that, the ebuild shall be fit for out-of-source build. -DISTUTILS_IN_SOURCE_BUILD=1 - -distutils_enable_tests pytest - -pkg_setup() { - unset DISPLAY # bug #278524 -} - -use_supported() { - case ${1} in - wxwidgets) - [[ ${EPYTHON} == python3.[678] ]] - ;; - esac - - return 0 -} - -use_setup() { - local uword="${2:-${1}}" - if use_supported "${1}" && use "${1}"; then - echo "${uword} = True" - echo "${uword}agg = True" - else - echo "${uword} = False" - echo "${uword}agg = False" - fi -} - -python_prepare_all() { -# Generates test failures, but fedora does it -# local PATCHES=( -# "${FILESDIR}"/${P}-unbundle-pycxx.patch -# "${FILESDIR}"/${P}-unbundle-agg.patch -# ) -# rm -r agg24 CXX || die -# rm -r agg24 || die - -# cat > lib/${PN}/externals/six.py <<-EOF -# from __future__ import absolute_import -# from six import * -# EOF - - local PATCHES=( - "${FILESDIR}"/matplotlib-3.3.0-test.patch - "${FILESDIR}"/matplotlib-3.3.2-test-extra.patch - ) - - # requires jupyter-nbconvert - rm lib/matplotlib/tests/test_backend_nbagg.py || die - - sed \ - -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \ - -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \ - || die "sed pyparsing failed" - - sed -e 's:\(@pytest.mark.flaky\)(reruns=3):\1:' \ - -i lib/matplotlib/tests/test_*.py || die - - hprefixify setupext.py - - rm -rf libqhull || die - - export XDG_RUNTIME_DIR="${T}/runtime-dir" - mkdir "${XDG_RUNTIME_DIR}" || die - chmod 0700 "${XDG_RUNTIME_DIR}" || die - - distutils-r1_python_prepare_all -} - -python_configure_all() { - append-flags -fno-strict-aliasing - append-cppflags -DNDEBUG # or get old trying to do triangulation - tc-export PKG_CONFIG -} - -python_configure() { - mkdir -p "${BUILD_DIR}" || die - - # create setup.cfg (see setup.cfg.template for any changes). - - # common switches. - cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die - [directories] - basedirlist = ${EPREFIX}/usr - [provide_packages] - pytz = False - dateutil = False - [libs] - system_freetype = True - system_qhull = True - [packages] - tests = $(usex test True False) - [gui_support] - agg = True - gtk = False - gtkagg = False - pyside = False - pysideagg = False - qt4 = False - qt4agg = False - $(use_setup cairo) - $(use_setup gtk3) - $(use_setup qt5) - $(use_setup tk) - $(use_setup wxwidgets wx) - EOF - - if use gtk3 && use cairo; then - echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die - else - echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die - fi -} - -wrap_setup() { - local MAKEOPTS=-j1 - local -x MPLSETUPCFG="${BUILD_DIR}"/setup.cfg - "$@" -} - -python_compile() { - wrap_setup distutils-r1_python_compile --build-lib="${BUILD_DIR}"/lib -} - -python_compile_all() { - if use doc; then - cd doc || die - - # necessary for in-source build - local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH} - - VARTEXFONTS="${T}"/fonts \ - emake SPHINXOPTS= O=-Dplot_formats=png:100 html - fi -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - # we need to rebuild mpl against bundled freetype, otherwise - # over 1000 tests will fail because of mismatched font rendering - grep -v system_freetype "${BUILD_DIR}"/setup.cfg \ - > "${BUILD_DIR}"/test-setup.cfg || die - local -x MPLSETUPCFG="${BUILD_DIR}"/test-setup.cfg - ln -s "${WORKDIR}/freetype-${FT_PV}" "${BUILD_DIR}" || die - distutils-r1_python_compile -j1 --build-lib="${BUILD_DIR}"/test-lib - local -x PYTHONPATH=${BUILD_DIR}/test-lib:${PYTHONPATH} - - "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(m.test(argv=['-m', 'not network'], verbosity=2))" || die -} - -python_install() { - wrap_setup distutils-r1_python_install - - # mpl_toolkits namespace - python_moduleinto mpl_toolkits - python_domodule lib/mpl_toolkits/__init__.py -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/build/html/. ) - - distutils-r1_python_install_all - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - find "${D}" -name '*.pth' -delete || die -} diff --git a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild index 469a6a712278..f9d13a43756c 100644 --- a/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild +++ b/dev-python/matplotlib/matplotlib-3.3.3-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched diff --git a/dev-python/matplotlib/matplotlib-3.3.4.ebuild b/dev-python/matplotlib/matplotlib-3.3.4.ebuild index a103db251a04..c67ab398e61b 100644 --- a/dev-python/matplotlib/matplotlib-3.3.4.ebuild +++ b/dev-python/matplotlib/matplotlib-3.3.4.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched -- cgit v1.2.3