From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- dev-python/matplotlib/Manifest | 13 +- .../matplotlib/files/matplotlib-3.3.0-test.patch | 225 ---------------- .../files/matplotlib-3.3.2-test-extra.patch | 25 -- .../files/matplotlib-3.3.4-test-extra.patch | 12 - dev-python/matplotlib/matplotlib-3.3.4.ebuild | 282 --------------------- dev-python/matplotlib/matplotlib-3.4.0.ebuild | 280 -------------------- dev-python/matplotlib/matplotlib-3.4.1.ebuild | 279 -------------------- dev-python/matplotlib/matplotlib-3.4.2.ebuild | 2 +- dev-python/matplotlib/matplotlib-3.4.3.ebuild | 2 +- 9 files changed, 4 insertions(+), 1116 deletions(-) delete mode 100644 dev-python/matplotlib/files/matplotlib-3.3.0-test.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch delete mode 100644 dev-python/matplotlib/files/matplotlib-3.3.4-test-extra.patch delete mode 100644 dev-python/matplotlib/matplotlib-3.3.4.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.4.0.ebuild delete mode 100644 dev-python/matplotlib/matplotlib-3.4.1.ebuild (limited to 'dev-python/matplotlib') diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest index 6a12e3910c3b..16572b9d0a9a 100644 --- a/dev-python/matplotlib/Manifest +++ b/dev-python/matplotlib/Manifest @@ -1,19 +1,10 @@ -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 AUX matplotlib-3.4.0-test.patch 10105 BLAKE2B 3a084180ec096a99d0b9a25458fd1b422d23599cb6fcbe0d7367df7e5c308675f92e95d008fb80e96125101f8f67c4b3a437209bc4bc032cb779130043827160 SHA512 f6196ded497e6c931f33a50cd82f4c7a5710dbc2dd1d74e3ba4467cf936176ef5a64fc2a9ff5281a0a114041c9751e352e522869ebb28e0e0bc50c4ebf1a8b5a AUX matplotlib-3.4.1-xelatex-test.patch 3200 BLAKE2B 0203bf1a3996ecf639d2dfee733f9fb1c664f35d501ca5049e5940b459f707cd4024b665106b62ab769805c4b976566c518a237637b766d97d2cb65abba8a266 SHA512 58c65834645974e56e6484788ed07d5bedaee3f72ff2023a36df9be3be03639eb588f769b7a727a5dc25a125d9df4d351e7fedc15699dd0576afd10718398fef AUX matplotlib-3.4.3-test-extra.patch 974 BLAKE2B 5b125219e92be435c26f466252206ca37dd22560c6ffda8311d4fe9f0b184b1f3f84c947cf9cd37f0abfbc5514ebf1999b9ceab6414dd0012bdc6948c51a83b1 SHA512 256657d7b25f4f71c7f01fe75423299f5715df45e7fcb41bc74c543383e5328a2482fdea287ce16212bfa9785fad182f3a91caa4f576687bd121bd6fc6c22dd2 DIST freetype-2.6.1.tar.gz 2302080 BLAKE2B 6a5fb98e5fa6cf4b7d7533ad44e364227d8c2f7dded4c552d6e22e204c32b7858f20d41d1e809ecdad6e5353d6cec81bea0e0b06a4533363a41ecab83ce3f7ca SHA512 ff2daed64d712737085924c50e75862fafbcbb24eef6d72dac9eaae63bb656d7245397fd828f5d3e47ac847f7ff83d73dedfdd61fde1f7d6e0f0cdeb49bcf83b -DIST matplotlib-3.3.4.tar.gz 37941665 BLAKE2B 77b86dc3ceec3695a0d749197bcec684893d237da1aaf8778d9dc2038da1ba56b757bbce94efcf215ac30f35420b77e0a0e75ebb75b6d2cde5146d8a35ee25e7 SHA512 aadfe3db4edde9940b9e15daf1b6c5f237d3a6f38610956ceee994f919d711fce818ea12be4db18aa2a8638c4e8f434d79541fecaa7233e233bf4c73792bc4c4 -DIST matplotlib-3.4.0.tar.gz 37142983 BLAKE2B 64b23d5b9e93e6b319674cea06d0ad425def952e50e7cb163ae91ae0d4460872bb329144271472b7dc2d0ab0a742c9c93ea735dca60ee4b4aa569cb4350cca0b SHA512 880c1e1027c819a34f5528b96d1b730cdd6541aa23931aef4185406ecec971ec2f4c8ca374eced56e654e016652472f7abcd0aae977dd4f327b8c511983a2a1d -DIST matplotlib-3.4.1.tar.gz 37253296 BLAKE2B e1dfd1b0d8bb0d3ed13ac03a5b3112a237c4b7ef3c82694ad6779c810bbd94c165bde88d00fad270d5da6e269d778b33f276620b51e1f134fa2c5b9dcb0a4f28 SHA512 076510ddd152a395fabb76aa47566e9b75f3c8ba3c5246b39229b20fbfc209d4bbdfd441271b22e364f0974963309c02bdd0519fc2a7e8a406afc462f69246b6 DIST matplotlib-3.4.2.tar.gz 37308683 BLAKE2B b769244b3d7a7da9125f6b634e9340676d849322491390d1c9a0cec3dfce59a8b5b5c0b567575ae78212129f7303b6b1fbbf30ce7c8a23c43c1304e83c9c5f5e SHA512 d4798dd2d6c857db0fe6d4ec85ebabc028b78627311bab17f7b9b30f6aa61d5243114b1cfe9d83293ad66ae47df83add5272f032954990dfc04054a792049f2a DIST matplotlib-3.4.3.tar.gz 37850796 BLAKE2B 15b40da8f6973ece4a91fffb5caf249cb8642263bfc2a784ec482bfaad250b6d3beffb9d2ba8a03e5fa10abab02b0e35728a8499ccb870aca06df57c5c1f91f4 SHA512 c2fe54e7517a1417aa8e55596e83edd090534c07f22882634d6ba0a07196441b5bbdd15958473805d8e8871b1b73380487aff3224294d472cd6122490c783145 -EBUILD matplotlib-3.3.4.ebuild 6929 BLAKE2B 22ff822577ff6cf4f692809429681a52f0f48591eaacf2858d04a34f7008473c803ef87f95ddae705e36c17a09dcaf61281410824e96a947d56e28cdd81ec4cb SHA512 a7af125117cf69af4a40debcbf3476342004100f3499f1028e7087e61168514693f086a6dfd6ace1616d8f27c343346d421a199073fff8a0a78d17062db40ed2 -EBUILD matplotlib-3.4.0.ebuild 6837 BLAKE2B 0ac7dc9aef75e2778102eeead917cff7e7627e1c158a9fcee0d1a247de2d0e5fc7b7b02cff543dbbeba236106f6915906391297bb34598c3ab6e349578caa960 SHA512 31f7cc26d605f3a3db310cf8b5d48a0bcb42e8aff0bf91ea6f94d072c049484be9bb3418aefeb6d02a14e241ff48fc95abf3dad7c87ae5a98d3842c3d0b548f4 -EBUILD matplotlib-3.4.1.ebuild 6845 BLAKE2B 91e4c9281b79eb1c0bba8142a8de315322198dec213755717d318b00ce90ee2746ea950d7bf3ddbcccb039d757801ad541922966574297d50843600c4bc28edd SHA512 19fc5c3e739c1d687c16339c361a36245fb48d84b31e274c15fde827458fb1723f7836a737d9750778bb1430e83ac328d9242868de817722143dba4cb7a49eaa -EBUILD matplotlib-3.4.2.ebuild 6931 BLAKE2B 0d0b1ff66719e46a7b18cb28cd2bd1b01381ba8c8c3e2a785e84ec02cd3f316a2e032162cd28af3dc7e7eb25c78fc10f15e957cc574ddde9ef8efe37f3e5ba82 SHA512 a7622d65a4c4fa2428e7c32636c324987d5521032104ef231c1d951a0e9d1f0c8aa7fd0ec2b327c818a5265309456799f458730d30cc8c8cbbd3afaf4764dd9b -EBUILD matplotlib-3.4.3.ebuild 6930 BLAKE2B 15d91236e8b0ba301c0df973df6426e48baa7c2cdbb2d114dfc72870bd2dd3e54865613a9572f97cfd1e76a94fc495ddf0dff9427183789d30cc5c14cd7ef286 SHA512 c440c2a3d325335b2314f27267685fc05c725a8e8fbe49b7be8ab4b92509c8a5b3e10ac3a20b099fcb8c991c13393325daa668fc1e063240973725bacd4d9075 +EBUILD matplotlib-3.4.2.ebuild 6925 BLAKE2B fe6cd0b20cbffbd9d85cfcd858c7f9c60db4f7ac45dc4788238c22531df3774fda6bb9b36ed07a7d0b4be3426033569825f78bfcc6de2efbc2e0f3e122498fd2 SHA512 342f540d80a45aef25187422682f0e4f052842cf9dd0f1234e8dc0eeabcce10913fd960cf122b57a1242a2229b752b9dd82b3f59818d50ac5cf16ccb0378033b +EBUILD matplotlib-3.4.3.ebuild 6942 BLAKE2B 715a7ebcece65c92a7131b12208a11358116ef5fc449bb2d5cd9b1757f8746ac368f4722539a5e12e14a269808baf47aa04a1f1dc75a0f46db5600b64eed32fe SHA512 4b889c08385cbcecbe43cbe7b1e0c9818c4378e84f755fbd1c47494f63eaaccb7208f87e3328ad11883edf7a3ed17dac3a3d0f32762e3cd7c6141f3e53ec1e72 MISC metadata.xml 1013 BLAKE2B 7a02989dfd3230db1225c97927adcf0b6b3fd0dc6d81cca69db3472f4f9fbb185daede39e35ad3477b1592a5deba76fb970be8559bc8b30791484bbe0624d417 SHA512 e1b11cfb0dc4f534f0a0b25bce759554906d5656b7c3607f56ae3b3cc53f8d30a3f5be1e6c96c3942dcb1b7ee0936ddd02c9560507d2d1d2fb46c2f4dbeba608 diff --git a/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch b/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch deleted file mode 100644 index c7ce64b9b3b3..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.3.0-test.patch +++ /dev/null @@ -1,225 +0,0 @@ -From 2fa4f25b9db19a1f59b03d56221c4752c03912fb 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] 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 | 8 +++++--- - 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 +- - lib/mpl_toolkits/tests/test_mplot3d.py | 2 +- - 11 files changed, 20 insertions(+), 17 deletions(-) - -diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py -index cca505ab9..871935c15 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=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02, - 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=0 if platform.machine() == 'x86_64' else 0.02, -+ tol=0.018 if platform.machine() == 'x86_64' else 0.02, - 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 6eedf20d5..198ed41ec 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -3718,7 +3718,7 @@ def test_vertex_markers(): - - - @image_comparison(['vline_hline_zorder', 'errorbar_zorder'], -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ tol=0.015 if platform.machine() == 'x86_64' else 0.02) - 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 702cc6c35..71038e702 100644 ---- a/lib/matplotlib/tests/test_backend_pgf.py -+++ b/lib/matplotlib/tests/test_backend_pgf.py -@@ -114,7 +114,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 " -@@ -151,7 +152,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() -@@ -178,7 +179,8 @@ def test_pathclip(): - # test mixed mode rendering - @needs_xelatex - @pytest.mark.backend('pgf') --@image_comparison(['pgf_mixedmode.pdf'], style='default') -+@image_comparison(['pgf_mixedmode.pdf'], style='default', -+ 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 aab35201c..a657198f7 100644 ---- a/lib/matplotlib/tests/test_figure.py -+++ b/lib/matplotlib/tests/test_figure.py -@@ -22,7 +22,7 @@ import pytest - - - @image_comparison(['figure_align_labels'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_align_labels(): - fig = plt.figure(tight_layout=True) - gs = gridspec.GridSpec(3, 3) -diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py -index 8e9c0771f..d1fb3818a 100644 ---- a/lib/matplotlib/tests/test_legend.py -+++ b/lib/matplotlib/tests/test_legend.py -@@ -105,7 +105,7 @@ def test_multiple_keys(): - - - @image_comparison(['rgba_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rgba(): - fig, ax = plt.subplots(1, 1) - ax.plot(range(10), lw=5) -@@ -114,7 +114,7 @@ def test_alpha_rgba(): - - - @image_comparison(['rcparam_alpha.png'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.02) - def test_alpha_rcparam(): - fig, ax = plt.subplots(1, 1) - ax.plot(range(10), lw=5) -@@ -140,7 +140,7 @@ def test_fancy(): - - - @image_comparison(['framealpha'], remove_text=True, -- tol=0 if platform.machine() == 'x86_64' else 0.02) -+ 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 82bf4d8e8..13046357a 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=0 if platform.machine() == 'x86_64' else 0.082) -+ 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 252136b4d..f0e7ced31 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=0 if platform.machine() == 'x86_64' else 0.01) -+ tol=0.002 if platform.machine() == 'x86_64' else 0.01) - 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=0 if platform.machine() == 'x86_64' else 0.01) -+ 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 25006f174..694a510e7 100644 ---- a/lib/matplotlib/tests/test_usetex.py -+++ b/lib/matplotlib/tests/test_usetex.py -@@ -13,7 +13,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 96830441e..c403b0bf2 100644 ---- a/lib/mpl_toolkits/tests/test_axes_grid1.py -+++ b/lib/mpl_toolkits/tests/test_axes_grid1.py -@@ -331,7 +331,7 @@ def test_zooming_with_inverted_axes(): - - - @image_comparison(['anchored_direction_arrows.png'], -- tol=0 if platform.machine() == 'x86_64' else 0.01) -+ 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 05534869a..6e7053722 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=0.03 if platform.machine() == 'x86_64' else 0.034) -+ tol=0.034) - def test_custom_transform(): - class MyTransform(Transform): - input_dims = output_dims = 2 -diff --git a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py -index 37532335e..5a2645235 100644 ---- a/lib/mpl_toolkits/tests/test_mplot3d.py -+++ b/lib/mpl_toolkits/tests/test_mplot3d.py -@@ -287,7 +287,7 @@ def test_marker_draw_order_view_rotated(fig_test, fig_ref): - ax.view_init(elev=0, azim=azim - 180) # view rotated by 180 degrees - - --@mpl3d_image_comparison(['plot_3d_from_2d.png'], tol=0.01) -+@mpl3d_image_comparison(['plot_3d_from_2d.png'], tol=0.012) - def test_plot_3d_from_2d(): - fig = plt.figure() - ax = fig.add_subplot(111, projection='3d') --- -2.27.0 - diff --git a/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch deleted file mode 100644 index 1fff166295b2..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.3.2-test-extra.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5d2f40b312966c08436b4495980313f2dacd9750 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 15 Sep 2020 23:48:05 +0200 -Subject: [PATCH] Increase tolerance for test_transparent_markers - ---- - lib/matplotlib/tests/test_axes.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py -index 412dd2471..52a32f9f1 100644 ---- a/lib/matplotlib/tests/test_axes.py -+++ b/lib/matplotlib/tests/test_axes.py -@@ -3500,7 +3500,7 @@ def test_hist_labels(): - assert l[2][0].get_label() == '00' - - --@image_comparison(['transparent_markers'], remove_text=True) -+@image_comparison(['transparent_markers'], remove_text=True, tol=5) - def test_transparent_markers(): - np.random.seed(0) - data = np.random.random(50) --- -2.28.0 - diff --git a/dev-python/matplotlib/files/matplotlib-3.3.4-test-extra.patch b/dev-python/matplotlib/files/matplotlib-3.3.4-test-extra.patch deleted file mode 100644 index 0c62334086a6..000000000000 --- a/dev-python/matplotlib/files/matplotlib-3.3.4-test-extra.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dupr a/lib/mpl_toolkits/tests/test_mplot3d.py b/lib/mpl_toolkits/tests/test_mplot3d.py ---- a/lib/mpl_toolkits/tests/test_mplot3d.py 2021-01-29 10:43:01.196582153 +0100 -+++ b/lib/mpl_toolkits/tests/test_mplot3d.py 2021-01-29 10:44:36.084875177 +0100 -@@ -150,7 +150,7 @@ def test_contourf3d_fill(): - ax.set_zlim(-1, 1) - - --@mpl3d_image_comparison(['tricontour.png']) -+@mpl3d_image_comparison(['tricontour.png'], tol=0.02) - def test_tricontour(): - fig = plt.figure() - diff --git a/dev-python/matplotlib/matplotlib-3.3.4.ebuild b/dev-python/matplotlib/matplotlib-3.3.4.ebuild deleted file mode 100644 index 9e754ff8b2dd..000000000000 --- a/dev-python/matplotlib/matplotlib-3.3.4.ebuild +++ /dev/null @@ -1,282 +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(+)' - -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 webagg 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:= - 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}] - ) - webagg? ( - >=www-servers/tornado-6.0.4[${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}] - >=www-servers/tornado-6.0.4[${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 - "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch - "${FILESDIR}"/matplotlib-3.3.4-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 - macosx = 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.4.0.ebuild b/dev-python/matplotlib/matplotlib-3.4.0.ebuild deleted file mode 100644 index 70fc4ea111bf..000000000000 --- a/dev-python/matplotlib/matplotlib-3.4.0.ebuild +++ /dev/null @@ -1,280 +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(+)' - -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 webagg 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-2.2.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7[${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:= - 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}] - ) - webagg? ( - >=www-servers/tornado-6.0.4[${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}] - >=www-servers/tornado-6.0.4[${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.4.0-test.patch - "${FILESDIR}"/matplotlib-3.3.3-disable-lto.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 - macosx = 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.4.1.ebuild b/dev-python/matplotlib/matplotlib-3.4.1.ebuild deleted file mode 100644 index a145e84f8c2b..000000000000 --- a/dev-python/matplotlib/matplotlib-3.4.1.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE='tk?,threads(+)' - -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 ~sparc ~x86" -IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg 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-2.2.1[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-2.7[${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:= - 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}] - ) - webagg? ( - >=www-servers/tornado-6.0.4[${PYTHON_USEDEP}] - ) - wxwidgets? ( - dev-python/wxpython:*[${PYTHON_USEDEP}] - ) -" - -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}] - >=www-servers/tornado-6.0.4[${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.4.0-test.patch - "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch - "${FILESDIR}"/matplotlib-3.4.1-xelatex-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 - macosx = 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.4.2.ebuild b/dev-python/matplotlib/matplotlib-3.4.2.ebuild index 03a2fb799d69..fa2b2aa00c9e 100644 --- a/dev-python/matplotlib/matplotlib-3.4.2.ebuild +++ b/dev-python/matplotlib/matplotlib-3.4.2.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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc 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.4.3.ebuild b/dev-python/matplotlib/matplotlib-3.4.3.ebuild index 363f617b719f..ef5afb63c248 100644 --- a/dev-python/matplotlib/matplotlib-3.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-3.4.3.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 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched -- cgit v1.2.3