Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

python-matplotlib.spec

@@ -6,7 +6,11 @@
 # you won't get the same error. Unless someone can figure out what's
 # going on, we just have to keep re-running the build until it doesn't
 # happen.
-%global run_tests               1
+%ifnarch riscv64
+%bcond_without run_tests
+%else
+%bcond_with run_tests
+%endif
 
 # the default backend; one of GTK3Agg GTK3Cairo MacOSX Qt4Agg Qt5Agg TkAgg
 # WXAgg Agg Cairo PS PDF SVG
@@ -44,7 +48,7 @@
 
 Name:           python-matplotlib
 Version:        3.2.1
-Release:        1%{?rctag:.%{rctag}}%{?dist}.1
+Release:        1%{?rctag:.%{rctag}}.0.riscv64%{?dist}.1
 Summary:        Python 2D plotting library
 # qt4_editor backend is MIT
 License:        Python and MIT
@@ -163,7 +167,7 @@ Requires:       python3-cycler >= 0.10.0
 Requires:       python3-dateutil
 Requires:       python3-kiwisolver
 Requires:       python3-matplotlib-%{?backend_subpackage}%{!?backend_subpackage:tk}%{?_isa} = %{version}-%{release}
-%if %{run_tests}
+%if %{with run_tests}
 BuildRequires:  python3-pytest
 BuildRequires:  python3-pytest-rerunfailures
 BuildRequires:  python3-pytest-timeout
@@ -331,7 +335,7 @@ mv %{buildroot}%{python3_sitearch}/matplotlib/mpl-data \
 rm -rf %{buildroot}%{_datadir}/matplotlib/mpl-data/fonts
 %endif
 
-%if %{run_tests}
+%if %{with run_tests}
 %check
 # These files confuse pytest, and we want to test the installed copy.
 rm -rf build*/
@@ -447,6 +451,9 @@ PYTHONDONTWRITEBYTECODE=1 \
 
 
 %changelog
+* Wed Jun 03 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 3.2.1-1.0.riscv64.1
+- Disable tests on RISC-V (riscv64)
+
 * Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 3.2.1-1.1
 - Rebuilt for Python 3.9