From a093b1d73a7573e0d50b85e8e5e8e3d3b055b5a25ecc55c4f2ea0b50e5b3e269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 6 Jun 2019 13:41:15 +0000 Subject: [PATCH 1/3] - Drop not really needed devel dependency OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinx-autodoc-typehints?expand=0&rev=4 --- python-sphinx-autodoc-typehints.changes | 5 +++++ python-sphinx-autodoc-typehints.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/python-sphinx-autodoc-typehints.changes b/python-sphinx-autodoc-typehints.changes index 0753114..bcebcb6 100644 --- a/python-sphinx-autodoc-typehints.changes +++ b/python-sphinx-autodoc-typehints.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 6 13:41:01 UTC 2019 - Tomáš Chvátal + +- Drop not really needed devel dependency + ------------------------------------------------------------------- Sat Mar 23 14:37:28 UTC 2019 - Sebastian Wagner diff --git a/python-sphinx-autodoc-typehints.spec b/python-sphinx-autodoc-typehints.spec index b913cb6..c1f14da 100644 --- a/python-sphinx-autodoc-typehints.spec +++ b/python-sphinx-autodoc-typehints.spec @@ -28,7 +28,6 @@ Url: https://github.com/agronholm/sphinx-autodoc-typehints Source: https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx-autodoc-typehints-%{version}.tar.gz Requires: python-Sphinx Requires: python-typing_extensions -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools >= 36.2.7} BuildRequires: %{python_module setuptools_scm >= 1.7.0} BuildRequires: fdupes From 88d4a5acf0821ffb45aa9ad04654e1e366f9cfaa0aa40f08bf8bb5481cf3b222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Jul 2019 09:14:31 +0000 Subject: [PATCH 2/3] - Add patch to fix build with new sphinx OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinx-autodoc-typehints?expand=0&rev=5 --- python-sphinx-autodoc-typehints.changes | 5 +++++ python-sphinx-autodoc-typehints.spec | 11 ++++++----- sphinx21.patch | 22 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 sphinx21.patch diff --git a/python-sphinx-autodoc-typehints.changes b/python-sphinx-autodoc-typehints.changes index bcebcb6..aeea171 100644 --- a/python-sphinx-autodoc-typehints.changes +++ b/python-sphinx-autodoc-typehints.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 3 09:13:37 UTC 2019 - Tomáš Chvátal + +- Add patch to fix build with new sphinx + ------------------------------------------------------------------- Thu Jun 6 13:41:01 UTC 2019 - Tomáš Chvátal diff --git a/python-sphinx-autodoc-typehints.spec b/python-sphinx-autodoc-typehints.spec index c1f14da..b4de616 100644 --- a/python-sphinx-autodoc-typehints.spec +++ b/python-sphinx-autodoc-typehints.spec @@ -24,22 +24,22 @@ Release: 0 Summary: Type hints (PEP 484) support for the Sphinx autodoc extension License: MIT Group: Development/Languages/Python -Url: https://github.com/agronholm/sphinx-autodoc-typehints +URL: https://github.com/agronholm/sphinx-autodoc-typehints Source: https://files.pythonhosted.org/packages/source/s/sphinx-autodoc-typehints/sphinx-autodoc-typehints-%{version}.tar.gz -Requires: python-Sphinx -Requires: python-typing_extensions +Patch0: sphinx21.patch BuildRequires: %{python_module setuptools >= 36.2.7} BuildRequires: %{python_module setuptools_scm >= 1.7.0} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-Sphinx >= 1.7 +Requires: python-typing_extensions +BuildArch: noarch # SECTION tests BuildRequires: %{python_module Sphinx >= 1.7} BuildRequires: %{python_module pathlib} BuildRequires: %{python_module pytest} BuildRequires: %{python_module typing_extensions} # /SECTION -BuildArch: noarch - %python_subpackages %description @@ -48,6 +48,7 @@ and return value types of functions. %prep %setup -q -n sphinx-autodoc-typehints-%{version} +%patch0 -p1 %build %python_build diff --git a/sphinx21.patch b/sphinx21.patch new file mode 100644 index 0000000..b68447f --- /dev/null +++ b/sphinx21.patch @@ -0,0 +1,22 @@ +From 367e32cea5218af9d8df9800bde395cc285e0fad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= +Date: Mon, 3 Jun 2019 00:11:22 +0300 +Subject: [PATCH] Fixed tests failing on Sphinx 2.1+ + +--- + tests/test_sphinx_autodoc_typehints.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_sphinx_autodoc_typehints.py b/tests/test_sphinx_autodoc_typehints.py +index b751176..d83f484 100644 +--- a/tests/test_sphinx_autodoc_typehints.py ++++ b/tests/test_sphinx_autodoc_typehints.py +@@ -231,7 +231,7 @@ class InnerClass + Return type: + "str" + +- a_property ++ property a_property + + Property docstring + From 7f7d27d3b7a19986b74b0a861ce5c040a5477e47cbe15a4dd2167b1a22f34f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 3 Jul 2019 09:20:15 +0000 Subject: [PATCH 3/3] - Add patch to fix build with new sphinx: * sphinx21.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinx-autodoc-typehints?expand=0&rev=6 --- python-sphinx-autodoc-typehints.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-sphinx-autodoc-typehints.changes b/python-sphinx-autodoc-typehints.changes index aeea171..468fe39 100644 --- a/python-sphinx-autodoc-typehints.changes +++ b/python-sphinx-autodoc-typehints.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Jul 3 09:13:37 UTC 2019 - Tomáš Chvátal -- Add patch to fix build with new sphinx +- Add patch to fix build with new sphinx: + * sphinx21.patch ------------------------------------------------------------------- Thu Jun 6 13:41:01 UTC 2019 - Tomáš Chvátal