diff --git a/.gitignore b/.gitignore index 79456ec..fe6cd0f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ zope.interface-3.6.1.tar.gz /zope.interface-5.5.1.tar.gz /zope.interface-5.5.2.tar.gz /zope.interface-6.0.tar.gz +/zope.interface-6.2.tar.gz diff --git a/281.patch b/281.patch deleted file mode 100644 index 5c8db6f..0000000 --- a/281.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c97078652590b916830afd156a5269dfe5f54e40 Mon Sep 17 00:00:00 2001 -From: Lumir Balhar -Date: Mon, 18 Dec 2023 13:46:06 +0100 -Subject: [PATCH] Make test_document compatible with Python 3.13 - -In Python 3.13, compiler strips indents from docstrings. -See https://github.com/python/cpython/issues/81283 - -Fixes: https://github.com/zopefoundation/zope.interface/issues/279 ---- - src/zope/interface/tests/test_document.py | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/src/zope/interface/tests/test_document.py b/src/zope/interface/tests/test_document.py -index 3e6dddd8..f00e6311 100644 ---- a/src/zope/interface/tests/test_document.py -+++ b/src/zope/interface/tests/test_document.py -@@ -13,6 +13,7 @@ - ############################################################################## - """Documentation tests. - """ -+import sys - import unittest - - -@@ -50,14 +51,17 @@ class IEmpty(Interface): - - def test_asStructuredText_empty_with_multiline_docstring(self): - from zope.interface import Interface -+ # In Python 3.13+, compiler strips indents from docstrings -+ indent = " " * 12 if sys.version_info < (3, 13) else "" -+ - EXPECTED = '\n'.join([ - "IEmpty", - "", - " This is an empty interface.", - " ", -- (" It can be used to annotate any class or object, " -+ (f"{indent} It can be used to annotate any class or object, " - "because it promises"), -- " nothing.", -+ f"{indent} nothing.", - "", - " Attributes:", - "", -@@ -274,14 +278,17 @@ class IEmpty(Interface): - - def test_asReStructuredText_empty_with_multiline_docstring(self): - from zope.interface import Interface -+ # In Python 3.13+, compiler strips indents from docstrings -+ indent = " " * 12 if sys.version_info < (3, 13) else "" -+ - EXPECTED = '\n'.join([ - "``IEmpty``", - "", - " This is an empty interface.", - " ", -- (" It can be used to annotate any class or object, " -+ (f"{indent} It can be used to annotate any class or object, " - "because it promises"), -- " nothing.", -+ f"{indent} nothing.", - "", - " Attributes:", - "", diff --git a/python-zope-interface.spec b/python-zope-interface.spec index 9dcde93..122fd98 100644 --- a/python-zope-interface.spec +++ b/python-zope-interface.spec @@ -6,16 +6,13 @@ %global _docdir_fmt %{name} Name: python-zope-interface -Version: 6.0 +Version: 6.2 Release: %autorelease Summary: Zope 3 Interface Infrastructure License: ZPLv2.1 URL: https://pypi.io/project/zope.interface Source0: https://pypi.io/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz -# Make test_document compatible with Python 3.13 -Patch: https://github.com/zopefoundation/zope.interface/pull/281.patch - %description Interfaces are a mechanism for labeling objects as conforming to a given API or contract. diff --git a/sources b/sources index 29caa99..5c47df5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zope.interface-6.0.tar.gz) = ed6bc98a61c91c34cfd8e24a8545e462fdffab13bc77a8144714a9cdd3bc7f4b873a50597a64f50b3c811f57218e1f2c78ceb267e52ae0ab5c136f082caa0612 +SHA512 (zope.interface-6.2.tar.gz) = 42c169ba88e0e4fe7895f0956250ddb5f3e9aef3e73a801ef71b0e94f906e9f597008de16955a7a8a5ca59551b800e6f000c70ffb3f486a7cbb7bf9caa00059d