From 84f636da0e589bc15d788b26b68bd442067cf67b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jan 09 2024 16:41:55 +0000 Subject: Version 0.4.3 Drop upstreamed Sphinx 7.2.x patch --- diff --git a/python-sphinxcontrib-zopeext-objectmembers.patch b/python-sphinxcontrib-zopeext-objectmembers.patch deleted file mode 100644 index 39d4b6f..0000000 --- a/python-sphinxcontrib-zopeext-objectmembers.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- sphinxcontrib_zopeext-0.4.2/src/sphinxcontrib/zopeext/autointerface.py.orig 2022-08-31 14:16:02.039405800 -0600 -+++ sphinxcontrib_zopeext-0.4.2/src/sphinxcontrib/zopeext/autointerface.py 2023-10-30 08:31:56.761865968 -0600 -@@ -42,7 +42,7 @@ Implementation Details - setup - - """ --from typing import Any, Dict, Tuple -+from typing import Any, Dict, Tuple, Union - - import sphinx.ext.autodoc - import sphinx.domains.python -@@ -54,9 +54,13 @@ import zope.interface.interface - - from sphinx.ext.autodoc import ( - ClassDocumenter, -- ObjectMembers, -+ ObjectMember, - logger, - ) -+ -+# This has been removed from sphinx since version 7.2.0. -+ObjectMembers = Union[list[ObjectMember], list[tuple[str, Any]]] -+ - from sphinx.domains.python import PyXRefRole - - from . import __version__ diff --git a/python-sphinxcontrib-zopeext.spec b/python-sphinxcontrib-zopeext.spec index bc487bb..32144fb 100644 --- a/python-sphinxcontrib-zopeext.spec +++ b/python-sphinxcontrib-zopeext.spec @@ -1,17 +1,14 @@ # We cannot build docs for this package due to lack of sphinx-book-theme Name: python-sphinxcontrib-zopeext -Version: 0.4.2 -Release: 4%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: Sphinx extension for documenting Zope interfaces License: BSD-2-Clause URL: https://pypi.org/project/sphinxcontrib-zopeext/ BuildArch: noarch Source0: %pypi_source sphinxcontrib_zopeext -# Cope with removal of ObjectMembers in Sphinx 7.2.0 -# https://github.com/sphinx-contrib/zopeext/pull/15 -Patch0: %{name}-objectmembers.patch BuildRequires: python3-devel @@ -44,6 +41,10 @@ interfaces. %license LICENSE %changelog +* Tue Jan 9 2024 Jerry James - 0.4.3-1 +- Version 0.4.3 +- Drop upstreamed Sphinx 7.2.x patch + * Mon Oct 30 2023 Jerry James - 0.4.2-4 - Add patch for Sphinx 7.2.x diff --git a/sources b/sources index fe364ce..ee4551d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sphinxcontrib_zopeext-0.4.2.tar.gz) = acf78a943ff6842184b347251398df3e20f045601bbba755152f891ee8a5d08e137dea5dbbc38f8a82ea5f045681dce6ac83a2329d74d378d56758031111c317 +SHA512 (sphinxcontrib_zopeext-0.4.3.tar.gz) = 17e1b38f7558e8121a058855246d22c3a7d8b07188669162e88bab860c3b8a585f1f7c5f7544e772812ea9c3e33ffff85c6c6c91eb965d9e49717d1e650e952a