Do not BR matplotlib on epel10

2024-11-11 09:56:45 -07:00
3 changed files with 11 additions and 72 deletions
@@ -1,25 +0,0 @@
-From 1338660931330bfd881c2c5792ac7ac1ee3dab96 Mon Sep 17 00:00:00 2001
-From: Ross Barnowski <rossbar@caltech.edu>
-Date: Thu, 17 Oct 2024 07:21:24 -0700
-Subject: [PATCH] MAINT: Add _exception_on_warning to MockApp (#586)
-
-MockApp in test suite is now breaking due to the absence
-of a private _exception_on_warning attribute.
-
-Fix by explicitly adding to the MockApp.
---
- numpydoc/tests/test_numpydoc.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/numpydoc/tests/test_numpydoc.py b/numpydoc/tests/test_numpydoc.py
-index f46e2565..997cb0a5 100644
--- a/numpydoc/tests/test_numpydoc.py
-+++ b/numpydoc/tests/test_numpydoc.py
-@@ -49,6 +49,7 @@ def __init__(self):
-         self.verbosity = 2
-         self._warncount = 0
-         self.warningiserror = False
-+        self._exception_on_warning = False
- 
- 
- def test_mangle_docstrings_basic():
@@ -1,24 +0,0 @@
-From ef7204ccf6d2fbf5b465d30d74dd2245ff3e2f6b Mon Sep 17 00:00:00 2001
-From: Karolina Surma <ksurma@redhat.com>
-Date: Thu, 27 Mar 2025 11:56:04 +0100
-Subject: [PATCH] Add compatibility with sphinx 8.2+
-
---
- numpydoc/tests/test_numpydoc.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/numpydoc/tests/test_numpydoc.py b/numpydoc/tests/test_numpydoc.py
-index 1bd71ed..ecb92e2 100644
--- a/numpydoc/tests/test_numpydoc.py
-+++ b/numpydoc/tests/test_numpydoc.py
-@@ -36,6 +36,7 @@ class MockConfig:
- 
- class MockBuilder:
-     config = MockConfig()
-+    _translator = None
- 
- 
- class MockApp:
-- 
-2.48.1
-
@@ -1,18 +1,18 @@
+# No matplot yet in EPEL10
+%if 0%{?rhel} >= 10
+%bcond_with matplotlib
+%else
+%bcond_without matplotlib
+%endif
+
 Name:           python-numpydoc
 Version:        1.8.0
-Release:        6%{?dist}
+Release:        1%{?dist}
 Summary:        Sphinx extension to support docstrings in NumPy format

 License:        BSD-2-Clause
 URL:            https://pypi.python.org/pypi/numpydoc
 Source:         %pypi_source numpydoc
-
-# Compatibility with sphinx 8
-Patch:          https://github.com/numpy/numpydoc/commit/1338660.patch
-# Upstream's already fixed it, but the fix is mixed with other changes that
-# don't apply cleanly: https://github.com/numpy/numpydoc/pull/611
-Patch:          Add-compatibility-with-sphinx-8.patch
-
 BuildArch:      noarch

 BuildRequires:  python3-devel
@@ -36,6 +36,9 @@ Summary:        %{summary}
 # let's not measure coverage:
 sed -i '/pytest-cov/d' requirements/test.txt pyproject.toml
 sed -Ei 's/\s+--cov\S+//g' pyproject.toml
+%if %{without matplotlib}
+sed -i '/matplotlib/d' requirements/test.txt pyproject.toml
+%endif

 # Remove a useless shebang
 sed -i '\,#!/usr/bin/env python,d' numpydoc/validate.py
@@ -60,21 +63,6 @@ sed -i '\,#!/usr/bin/env python,d' numpydoc/validate.py
 %{_bindir}/numpydoc

 %changelog
-* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.8.0-6
- Rebuilt for Python 3.14.0rc3 bytecode
-
-* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 1.8.0-5
- Rebuilt for Python 3.14.0rc2 bytecode
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 1.8.0-3
- Rebuilt for Python 3.14
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
 * Thu Oct 24 2024 Orion Poplawski <orion@nwra.com> - 1.8.0-1
 - Update to 1.8.0