Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-sphinxcontrib-autoprogram for
openSUSE:Factory checked in at 2022-02-23 16:26:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-autoprogram (Old)
and /work/SRC/openSUSE:Factory/.python-sphinxcontrib-autoprogram.new.1958
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-autoprogram"
Wed Feb 23 16:26:08 2022 rev:4 rq:956940 version:0.1.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-autoprogram/python-sphinxcontrib-autoprogram.changes
2021-10-12 21:51:16.480036751 +0200
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-autoprogram.new.1958/python-sphinxcontrib-autoprogram.changes
2022-02-23 16:26:56.611509889 +0100
@@ -1,0 +2,10 @@
+Tue Feb 22 11:19:17 UTC 2022 - [email protected]
+
+- fix build and introduced doc build flavor
+- modified sources
+ % _multibuild
+- added patches
+ fix https://github.com/sphinx-contrib/autoprogram/pull/25
+ + python-sphinxcontrib-autoprogram-python310.patch
+
+-------------------------------------------------------------------
New:
----
python-sphinxcontrib-autoprogram-python310.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-autoprogram.spec ++++++
--- /var/tmp/diff_new_pack.6iKAge/_old 2022-02-23 16:26:57.099509907 +0100
+++ /var/tmp/diff_new_pack.6iKAge/_new 2022-02-23 16:26:57.103509907 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,25 +18,29 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "test"
-%define psuffix -test
-%bcond_without test
-%else
%define psuffix %{nil}
-%bcond_with test
+%if "%{flavor}" != ""
+%define psuffix -%{flavor}
%endif
%global short_name autoprogram
#
https://github.com/sphinx-contrib/autoprogram/commit/457822502b71a449d97dfece63e77dbee910b581
%define skip_python36 1
+%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name: python-sphinxcontrib-%{short_name}
+Name: python-sphinxcontrib-%{short_name}%{psuffix}
Version: 0.1.7
Release: 0
+%if "%{flavor}" == "" || "%{flavor}" == "test"
Summary: Sphinx extension to document CLI programs
+%endif
+%if "%{flavor}" == "doc"
+Summary: Documentation for sphinxcontrib-autoprogram
+%endif
License: BSD-2-Clause
-Group: Development/Languages/Python
URL: https://github.com/sphinx-contrib/%{short_name}
-Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:
%{URL}/archive/%{version}/python-sphinxcontrib-%{short_name}-%{version}.tar.gz
+# https://github.com/sphinx-contrib/autoprogram/pull/25
+Patch0: python-sphinxcontrib-autoprogram-python310.patch
BuildRequires: %{python_module Sphinx >= 1.2}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -44,65 +48,61 @@
Requires: python-Sphinx >= 1.2
Requires: python-six
BuildArch: noarch
-%if %{with test}
+%if "%{flavor}" == "test"
BuildRequires: %{python_module six}
BuildRequires: %{python_module sphinxcontrib-autoprogram}
BuildRequires: %{python_module sphinxcontrib-websupport >= 1.0.1}
%endif
+%if "%{flavor}" == "doc"
+BuildRequires: %{python_module sphinxcontrib-autoprogram}
+%endif
%python_subpackages
+%if "%{flavor}" == "doc"
+%description
+This package contains the documentation for the package
+python-sphinxcontrib-autoprogram.
+%endif
+%if "%{flavor}" == "" || "%{flavor}" == "test"
%description
This contrib extension, sphinxcontrib.autoprogram, provides an automated way to
document CLI programs. It scans arparser.ArgumentParser object, and then
expands
it into a set of .. program:: and .. option:: directives.
-
-%package doc
-Summary: Documentation for sphinxcontrib-autoprogram
-Group: Documentation/HTML
-
-%description doc
-This package contains the documentation for the package
-python-sphinxcontrib-autoprogram.
+%endif
%prep
%autosetup -n %{short_name}-%{version} -p1
%build
-%if !%{with test}
+%if "%{flavor}" == ""
%python_build
-
-# need to set PYTHONPATH, otherwise the build won't find the extension in the
-# subfolder
-export PYTHONPATH=$(pwd)
-# set PYTHON so that the sphinx Makefile picks up the correct python version
-%{python_expand export PYTHON=$python}
+%endif
+%if "%{flavor}" == "doc"
sphinx-build -b html -d doc/_build/doctrees doc doc/_build/html
-
-# remove inventory file, not needed for the documentation
rm doc/_build/html/objects.inv
%endif
%install
-%if !%{with test}
+%if "%{flavor}" == ""
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%endif
%check
-%if %{with test}
+%if "%{flavor}" == "test"
export PYTHONPATH='doc'
%pyunittest sphinxcontrib/autoprogram.py
%endif
-%if !%{with test}
+%if "%{flavor}" == ""
%files %{python_files}
%doc README.rst
%license LICENSE
%{python_sitelib}/*
%endif
-%if !%{with test}
-%files %{python_files doc}
+%if "%{flavor}" == "doc"
+%files %{python_files}
%license LICENSE
%doc doc/_build/html/*
%endif
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.6iKAge/_old 2022-02-23 16:26:57.135509908 +0100
+++ /var/tmp/diff_new_pack.6iKAge/_new 2022-02-23 16:26:57.143509908 +0100
@@ -1,4 +1,5 @@
<multibuild>
+ <package>doc</package>
<package>test</package>
</multibuild>
++++++ python-sphinxcontrib-autoprogram-python310.patch ++++++
Index: autoprogram-0.1.7/sphinxcontrib/autoprogram.py
===================================================================
--- autoprogram-0.1.7.orig/sphinxcontrib/autoprogram.py 2022-02-18
13:57:19.100334018 +0100
+++ autoprogram-0.1.7/sphinxcontrib/autoprogram.py 2022-02-18
13:57:56.028550128 +0100
@@ -476,7 +476,11 @@ class ScannerTestCase(unittest.TestCase)
# section: default optionals
program, options, group = sections[1]
self.assertEqual([], program)
- self.assertEqual("optional arguments", group.title)
+ # See https://github.com/sphinx-contrib/autoprogram/issues/24
+ if sys.version_info >= (3, 10):
+ self.assertEqual('options', group.title)
+ else:
+ self.assertEqual("optional arguments", group.title)
self.assertEqual(None, group.description)
self.assertEqual(2, len(options))
self.assertEqual(
