- Fix Provides and Obsoletes ... we cannot use python_module there

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=193
This commit is contained in:
2021-11-10 13:57:54 +00:00
committed by Git OBS Bridge
parent 0dbe52f89b
commit 0d13e40a4c
3 changed files with 30 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 10 13:57:29 UTC 2021 - Matej Cepl <mcepl@suse.com>
- Fix Provides and Obsoletes ... we cannot use python_module there
-------------------------------------------------------------------
Tue Sep 14 09:13:14 UTC 2021 - Martin Liška <mliska@suse.cz>

View File

@@ -40,6 +40,9 @@ Source1: https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%
Source2: https://docs.python.org/3/objects.inv#/python3.inv
Source3: https://requests.readthedocs.io/en/master/objects.inv#/requests.inv
Source99: python-Sphinx-rpmlintrc
# PATCH-FIX-UPSTREAM sphinx-signature-annotations.patch bsc#[0-9]+ mcepl@suse.com
# take signatures with arguments in both positions.
Patch0: sphinx-signature-annotations.patch
BuildRequires: %{python_module base}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -201,7 +204,7 @@ Requires: python3-Sphinx = %{version}
Requires(post): update-alternatives
Requires(postun):update-alternatives
Supplements: python3-Sphinx
Obsoletes: %{python_module Sphinx-doc-man-common <= %{version}}
Obsoletes: python-Sphinx-doc-man-common <= %{version}
%description -n python-Sphinx-doc-man
Sphinx is a tool that facilitates creating documentation for Python
@@ -213,7 +216,7 @@ This package contains the manual pages for the Sphinx executables.
%package -n python-Sphinx-doc-html
Summary: HTML Documentation for python-Sphinx
Group: Documentation/HTML
Provides: %{python_module Sphinx-doc-html = %{version}}
Provides: python-Sphinx-doc-html = %{version}
%description -n python-Sphinx-doc-html
Sphinx is a tool that facilitates creating documentation for Python

View File

@@ -0,0 +1,20 @@
---
tests/test_util_inspect.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
--- a/tests/test_util_inspect.py
+++ b/tests/test_util_inspect.py
@@ -198,11 +198,8 @@ def test_signature_annotations():
# optional union
sig = inspect.signature(f20)
- if sys.version_info < (3, 7):
- assert stringify_signature(sig) in ('() -> Optional[Union[int, str]]',
- '() -> Optional[Union[str, int]]')
- else:
- assert stringify_signature(sig) == '() -> Optional[Union[int, str]]'
+ assert stringify_signature(sig) in ('() -> Optional[Union[int, str]]',
+ '() -> Optional[Union[str, int]]')
# Any
sig = inspect.signature(f14)