From 1da1ed24cfba8a051b6c2f452a67ebfee77ca040 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 23 Apr 2023 15:42:19 +0200 Subject: [PATCH] Use dufte style from matplotx. The stand-alone dufte package has been deprecated in favor of the dufte style that has been integrated into matplotx. --- tests/test_dot.py | 10 +++++----- tests/test_sums.py | 12 ++++++------ tox.ini | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/test_dot.py b/tests/test_dot.py index 0a40a0c..a8160fe 100644 --- a/tests/test_dot.py +++ b/tests/test_dot.py @@ -1,5 +1,5 @@ -import dufte import matplotlib.pyplot as plt +import matplotx import numpy as np import perfplot import pytest @@ -33,7 +33,7 @@ def test_fdot(cond): def test_accuracy_comparison_illcond(target_cond=None): - plt.style.use(dufte.style) + plt.style.use(matplotx.styles.dufte) if target_cond is None: target_cond = [10 ** k for k in range(2)] @@ -61,13 +61,13 @@ def test_accuracy_comparison_illcond(target_cond=None): for label, d in zip(labels, data.T): plt.loglog(condition_numbers, d, label=label) - dufte.legend() + matplotx.line_labels() plt.xlabel("condition number") - dufte.ylabel("relative error") + matplotx.ylabel_top("relative error") def test_speed_comparison1(n_range=None): - plt.style.use(dufte.style) + plt.style.use(matplotx.styles.dufte) if n_range is None: n_range = [2 ** k for k in range(2)] diff --git a/tests/test_sums.py b/tests/test_sums.py index 1c0f6b0..8cd9ddb 100644 --- a/tests/test_sums.py +++ b/tests/test_sums.py @@ -1,5 +1,5 @@ -import dufte import matplotlib.pyplot as plt +import matplotx import numpy as np import perfplot import pytest @@ -32,7 +32,7 @@ def test_fsum(cond): def test_accuracy_comparison_illcond(target_conds=None): - plt.style.use(dufte.style) + plt.style.use(matplotx.styles.dufte) if target_conds is None: target_conds = [10 ** k for k in range(1, 2)] @@ -71,14 +71,14 @@ def test_accuracy_comparison_illcond(target_conds=None): for label, color, d in zip(labels, colors, data.T): plt.loglog(condition_numbers, d, label=label, color=color) - dufte.legend() + matplotx.line_labels() plt.xlabel("condition number") - dufte.ylabel("relative error") + matplotx.ylabel_top("relative error") # plt.gca().set_aspect(1.3) def test_speed_comparison1(n_range=None): - plt.style.use(dufte.style) + plt.style.use(matplotx.styles.dufte) if n_range is None: n_range = [2 ** k for k in range(2)] @@ -109,7 +109,7 @@ def test_speed_comparison1(n_range=None): def test_speed_comparison2(n_range=None): - plt.style.use(dufte.style) + plt.style.use(matplotx.styles.dufte) if n_range is None: n_range = [2 ** k for k in range(2)] diff --git a/tox.ini b/tox.ini index 79a53ec..524b3bc 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ isolated_build = True [testenv] deps = - dufte + matplotx perfplot pytest pytest-cov -- 2.39.2 Add freetype, libxaw, and libxft. * gnu/packages/patches/ddd-build.patch: New file. * gnu/local.mk: Register new file. Change-Id: Ic305cc0c7e15d0f0565f2adde514a43497e11f98 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Andy Tai 2024-09-08gnu: aflplusplus: Update to 4.21c....* gnu/packages/debug.scm (aflplusplus): Update to 4.21c. Change-Id: I7fcd55d0e9df0f3b3daf1fcb527f7b2948fb941e Tobias Geerinckx-Rice 2024-08-31gnu: Add backward-cpp....* gnu/packages/debug.scm (backward-cpp): New variable. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com> Adam Faiz 2024-08-31gnu: debug: Add 'bash' input for 'wrap-program'....It is required for cross-compilation. * gnu/packages/debug.scm (c-reduce)[inputs]: Add 'bash-minimal'. (scanmem)[inputs]: Likewise. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Change-Id: I6cae82e90a994384aa3ddd737dd885444a0f5cad Maxime Devos 2024-07-26gnu: rr: Add ‘supported-systems’ field....* gnu/packages/debug.scm (rr)[supported-systems]: New field. Change-Id: I6d93b1eae91fbe6c963e737afd6e5d2a30160ac1 Ludovic Courtès 2024-07-20gnu: rr: Update to 5.8.0....* gnu/packages/debug.scm (rr): Update to 5.8.0. Change-Id: Ic4bf20a68d05233c28b3f3956e9c8e10dc78fb2e Signed-off-by: Ludovic Courtès <ludo@gnu.org> Karl Hallsby 2024-04-23gnu: Add cppdap....* gnu/packages/debug.scm (cppdap): New variable. * gnu/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Change-Id: I328ca0c01787defcc9d18f4ccd7762c86412cca7 Signed-off-by: Zheng Junjie <zhengjunjie@iscas.ac.cn> Daniel Ziltener 2024-01-25gnu: Add aflplusplus....* gnu/packages/debug.scm (aflplusplus): New variable. Change-Id: Ibda36187e839d5f533d461444db25a7ba5567f0f Modified-by: Hilton Chain <hako@ultrarare.space> Signed-off-by: Hilton Chain <hako@ultrarare.space> Denis 'GNUtoo' Carikli 2023-12-23gnu: rr: Update to 5.7.0....* gnu/packages/debug.scm (rr): Update to 5.7.0. Change-Id: I5b70f5d266876077b533182ccdcd2160fec6fcc4 Signed-off-by: Ludovic Courtès <ludo@gnu.org> Greg Hogan