Accepting request 1275448 from devel:languages:python

- Use multibuild for doc subpackage

OBS-URL: https://build.opensuse.org/request/show/1275448
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-manuel?expand=0&rev=18

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>doc</package>
+</multibuild>

python-manuel-no-six.patch

@@ -1,35 +0,0 @@
-Index: manuel-1.12.4/src/manuel/doctest.py
-===================================================================
---- manuel-1.12.4.orig/src/manuel/doctest.py
-+++ manuel-1.12.4/src/manuel/doctest.py
-@@ -3,13 +3,13 @@ from __future__ import absolute_import
- import doctest
- import manuel
- import os.path
--import six
-+import io
- 
- DocTestRunner = doctest.DocTestRunner
- DebugRunner = doctest.DebugRunner
- 
- 
--class DocTestResult(six.StringIO):
-+class DocTestResult(io.StringIO):
-     pass
- 
- 
-Index: manuel-1.12.4/setup.py
-===================================================================
---- manuel-1.12.4.orig/setup.py
-+++ manuel-1.12.4/setup.py
-@@ -48,10 +48,6 @@ setup(
-         },
-     tests_require=tests_require,
-     test_suite='manuel.tests.test_suite',
--    install_requires=[
--        'setuptools',
--        'six',
--        ],
-     include_package_data=True,
-     long_description=long_description,
-     keywords=['testing', 'documentation'],

python-manuel.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu May  8 08:54:10 UTC 2025 - Daniel Garcia <daniel.garcia@suse.com>
+
+- Use multibuild for doc subpackage
+
+-------------------------------------------------------------------
+Fri Feb  7 12:30:21 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 1.13.0
+  * Include*.md files in wheel These are needed by the test suite,
+    which is also included in the wheel.
+  * Fix tests on python3.11
+  * Update some web links
+  * Update pyinstaller to 6.1.0 for python >= 3.11 support
+  * doctest: use outputchecker argument also in debug mode. Fixes #38
+  * Remove references to old "six" module
+- Drop python-manuel-no-six.patch, merged upstream
+
 -------------------------------------------------------------------
 Tue Feb  6 14:04:47 UTC 2024 - Markéta Machová <mmachova@suse.com>
 

python-manuel.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-manuel
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 # Copyright (c) 2013-2018 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -17,17 +17,24 @@
 #
 
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "doc"
+%bcond_without doc
+%define psuffix -doc
+%else
+%bcond_with doc
+%define psuffix %{nil}
+%endif
+
 %{?sle15allpythons}
-Name:           python-manuel
+Name:           python-manuel%{psuffix}
-Version:        1.12.4
+Version:        1.13.0
 Release:        0
 Summary:        Python module to build tested documentation
 License:        Apache-2.0
 URL:            https://pypi.org/project/manuel/
 # SourceRepository: https://github.com/benji-york/manuel
 Source:         https://files.pythonhosted.org/packages/source/m/manuel/manuel-%{version}.tar.gz
-# https://github.com/benji-york/manuel/issues/33
-Patch0:         python-manuel-no-six.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module setuptools}
@@ -35,12 +42,15 @@ BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-%if 0%{?suse_version} >= 1600
+
+%if %{with doc} && 0%{?suse_version} >= 1600
 # SECTION Documentation requirements:
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-myst-parser
 BuildRequires:  python3-sphinxcontrib-copybutton
 # /SECTION
+%elif %{with doc}
+ExclusiveArch:  do-not-build
 %endif
 # SECTION Testing requirements:
 BuildRequires:  %{python_module zope.testing}
@@ -63,16 +73,18 @@ This package contains documentation files for %{name}.
 %autosetup -p1 -n manuel-%{version}
 
 %build
+%if %{without doc}
 %pyproject_wheel
-%if 0%{?suse_version} >= 1600
+%else
 sphinx-build -c sphinx/ -a src/manuel docs/
 rm docs/.buildinfo
 %endif
 
 %install
+%if %{without doc}
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
-%if 0%{?suse_version} >= 1600
+%else
 %{python_expand #
 mkdir -p %{buildroot}%{_docdir}/%{$python_prefix}-manuel-doc
 cp -r docs/* %{buildroot}%{_docdir}/%{$python_prefix}-manuel-doc
@@ -80,6 +92,7 @@ cp -r docs/* %{buildroot}%{_docdir}/%{$python_prefix}-manuel-doc
 }
 %endif
 
+%if %{without doc}
 %check
 %pytest src/manuel/tests.py
 
@@ -88,9 +101,10 @@ cp -r docs/* %{buildroot}%{_docdir}/%{$python_prefix}-manuel-doc
 %doc CHANGES.rst COPYRIGHT.rst PKG-INFO README.rst
 %{python_sitelib}/manuel
 %{python_sitelib}/manuel-%{version}.dist-info
+%endif
 
-%if 0%{?suse_version} >= 1600
+%if %{with doc}
-%files %{python_files doc}
+%files %{python_files}
 %doc %{_docdir}/%{python_prefix}-manuel-doc
 %endif