Benjamin Greiner
c3d2b4e05c
compatibility gh#sherpa/sherpa#2207 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:numeric/python-sherpa?expand=0&rev=50
87 lines
2.8 KiB
Diff
87 lines
2.8 KiB
Diff
From 5e3d13df1c09134fe5b1cbb27bfc3559ef0641a0 Mon Sep 17 00:00:00 2001
|
|
From: Doug Burke <dburke@cfa.harvard.edu>
|
|
Date: Fri, 3 Jan 2025 16:46:36 -0500
|
|
Subject: [PATCH] TESTS: avoid matplotlib version differences (fix #2206)
|
|
|
|
The matlpotlib get_linestyles method can return
|
|
|
|
[(x, None)]
|
|
|
|
where x = None, 0.0, or np.float64(0.0) depending on matplotlib
|
|
version (and probably NumPy).
|
|
|
|
Since we don't really care too much here, just check the return
|
|
has length of 1, the first element has length of 2, and the
|
|
second element is None.
|
|
---
|
|
sherpa/astro/ui/tests/test_astro_ui_plot.py | 35 +++++++++++----------
|
|
1 file changed, 18 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/sherpa/astro/ui/tests/test_astro_ui_plot.py b/sherpa/astro/ui/tests/test_astro_ui_plot.py
|
|
index a6b7c07aa8..5a41d3ce4e 100644
|
|
--- a/sherpa/astro/ui/tests/test_astro_ui_plot.py
|
|
+++ b/sherpa/astro/ui/tests/test_astro_ui_plot.py
|
|
@@ -1,5 +1,5 @@
|
|
#
|
|
-# Copyright (C) 2019 - 2024
|
|
+# Copyright (C) 2019 - 2025
|
|
# Smithsonian Astrophysical Observatory
|
|
#
|
|
#
|
|
@@ -32,6 +32,7 @@
|
|
|
|
import copy
|
|
import logging
|
|
+
|
|
import numpy as np
|
|
|
|
import pytest
|
|
@@ -1843,15 +1844,15 @@ def test_pha1_plot_data_options(caplog, clean_astro_ui, requires_pylab,
|
|
|
|
assert len(coll.get_segments()) == 42
|
|
|
|
- # The return value depends on matplotlib version (>= 3.3
|
|
- # returns something). What has changed? Maybe this should
|
|
- # not be tested?
|
|
+ # The linestyles return value has changed with matplotib
|
|
+ # and NumPy version, so just check the second element
|
|
+ # and not the first (which can be None, 0.0, np.float64(0)).
|
|
#
|
|
- expected = [(None, None)]
|
|
- if matplotlib.__version__ >= '3.3.0':
|
|
- expected = [(0.0, None)]
|
|
-
|
|
- assert coll.get_linestyles() == expected
|
|
+ #
|
|
+ ls = coll.get_linestyles()
|
|
+ assert len(ls) == 1
|
|
+ assert len(ls[0]) == 2
|
|
+ assert ls[0][1] is None
|
|
|
|
# looks like the color has been converted to individual channels
|
|
# - e.g. floating-point values for R, G, B, and alpha.
|
|
@@ -2041,15 +2042,15 @@ def test_pha1_plot_fit_options(clean_astro_ui, requires_pylab, basic_pha1):
|
|
|
|
assert len(coll.get_segments()) == 42
|
|
|
|
- # The return value depends on matplotlib version (>= 3.3
|
|
- # returns something). What has changed? Maybe this should
|
|
- # not be tested?
|
|
+ # The linestyles return value has changed with matplotib
|
|
+ # and NumPy version, so just check the second element
|
|
+ # and not the first (which can be None, 0.0, np.float64(0)).
|
|
#
|
|
- expected = [(None, None)]
|
|
- if matplotlib.__version__ >= '3.3.0':
|
|
- expected = [(0.0, None)]
|
|
-
|
|
- assert coll.get_linestyles() == expected
|
|
+ #
|
|
+ ls = coll.get_linestyles()
|
|
+ assert len(ls) == 1
|
|
+ assert len(ls[0]) == 2
|
|
+ assert ls[0][1] is None
|
|
|
|
# looks like the color has been converted to individual channels
|
|
# - e.g. floating-point values for R, G, B, and alpha.
|