diff --git a/0001-License-file-ci-skip.patch b/0001-License-file-ci-skip.patch deleted file mode 100644 index 5527cc9..0000000 --- a/0001-License-file-ci-skip.patch +++ /dev/null @@ -1,60 +0,0 @@ -From e5b9f7eb2f7fcf6f89ffa14a2c29ba9b3d92b723 Mon Sep 17 00:00:00 2001 -From: Hong Minhee -Date: Wed, 12 Dec 2018 21:23:49 +0900 -Subject: [PATCH] License file [ci skip] - -Fix https://github.com/sphinx-contrib/autoprogram/issues/4 ---- - LICENSE | 26 ++++++++++++++++++++++++++ - setup.py | 2 +- - 2 files changed, 27 insertions(+), 1 deletion(-) - create mode 100644 LICENSE - -diff --git a/LICENSE b/LICENSE -new file mode 100644 -index 0000000..4064009 ---- /dev/null -+++ b/LICENSE -@@ -0,0 +1,26 @@ -+Copyright (c) 2014–2018 Hong Minhee -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ -+1. Redistributions of source code must retain the above copyright notice, this -+ list of conditions and the following disclaimer. -+2. Redistributions in binary form must reproduce the above copyright notice, -+ this list of conditions and the following disclaimer in the documentation -+ and/or other materials provided with the distribution. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+The views and conclusions contained in the software and documentation are those -+of the authors and should not be interpreted as representing official policies, -+either expressed or implied, of the sphinxcontrib-autoprogram project. -diff --git a/setup.py b/setup.py -index 287f42e..17ddcc8 100644 ---- a/setup.py -+++ b/setup.py -@@ -24,7 +24,7 @@ setup( - name='sphinxcontrib-autoprogram', - version=version, - url='https://github.com/sphinx-contrib/autoprogram', -- license='BSD', -+ license='2-Clause BSD', - author='Hong Minhee', - author_email='\x68\x6f\x6e\x67.minhee' '@' '\x67\x6d\x61\x69\x6c.com', - description='Documenting CLI programs', --- -2.19.2 - diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/python-sphinxcontrib-autoprogram-0.1.5.tar.gz b/python-sphinxcontrib-autoprogram-0.1.5.tar.gz deleted file mode 100644 index f0d1b0c..0000000 --- a/python-sphinxcontrib-autoprogram-0.1.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bf0135cf7400e29982d61caf3b0a750e63c8b9e31ffb682a28a2e370e092951 -size 16091 diff --git a/python-sphinxcontrib-autoprogram-0.1.7.tar.gz b/python-sphinxcontrib-autoprogram-0.1.7.tar.gz new file mode 100644 index 0000000..008d743 --- /dev/null +++ b/python-sphinxcontrib-autoprogram-0.1.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0daa0c7cdeb7ca6c43ca53c4d588f390101d558191d733d0e8e80e44729f30c7 +size 18125 diff --git a/python-sphinxcontrib-autoprogram.changes b/python-sphinxcontrib-autoprogram.changes index 06e29d1..87d337f 100644 --- a/python-sphinxcontrib-autoprogram.changes +++ b/python-sphinxcontrib-autoprogram.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Oct 12 13:40:48 UTC 2021 - pgajdos@suse.com + +- version update to 0.1.7 + Version 0.1.7 + ------------- + - Publish to PyPI via Github Actions. + Version 0.1.6 + ------------- + - Dropped support for Python 2 and Pypy + - Declare this extension safe for parallel reading + - Migrate to Github Actions for CI [:issue:`28`, :pull:`32` by Langston Barrett] + - Test against recent versions of Sphinx [:issue:`33`, :pull:`32` by Langston Barrett] + - Format source code with Black [:issue:`30`, :pull:`32` by Langston Barrett] + - Add documentation to the ``sdist`` [:issue:`26`, :pull:`32` by Langston Barrett] + - Fixed unwanted ``
`` tags in multi-line command descriptions that + are indented to match surrounding code. [:pull:`21` by dgw] +- deleted patches + - 0001-License-file-ci-skip.patch (upstreamed) +- added sources + + _multibuild + ------------------------------------------------------------------- Tue Dec 18 10:25:10 UTC 2018 - Dan Čermák diff --git a/python-sphinxcontrib-autoprogram.spec b/python-sphinxcontrib-autoprogram.spec index 09ccf4b..27fcc21 100644 --- a/python-sphinxcontrib-autoprogram.spec +++ b/python-sphinxcontrib-autoprogram.spec @@ -1,7 +1,7 @@ # -# spec file for package python-sphinxcontrib +# spec file # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,39 @@ # +%{?!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 +%endif %global short_name autoprogram +# https://github.com/sphinx-contrib/autoprogram/commit/457822502b71a449d97dfece63e77dbee910b581 +%define skip_python36 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sphinxcontrib-%{short_name} -Version: 0.1.5 +Version: 0.1.7 Release: 0 Summary: Sphinx extension to document CLI programs License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/sphinx-contrib/%{short_name} Source0: %{URL}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-License-file-ci-skip.patch BuildRequires: %{python_module Sphinx >= 1.2} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module six} -BuildRequires: %{python_module sphinxcontrib-websupport >= 1.0.1} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Sphinx >= 1.2 Requires: python-six BuildArch: noarch +%if %{with test} +BuildRequires: %{python_module six} +BuildRequires: %{python_module sphinxcontrib-autoprogram} +BuildRequires: %{python_module sphinxcontrib-websupport >= 1.0.1} +%endif %python_subpackages %description @@ -55,6 +68,7 @@ python-sphinxcontrib-autoprogram. %autosetup -n %{short_name}-%{version} -p1 %build +%if !%{with test} %python_build # need to set PYTHONPATH, otherwise the build won't find the extension in the @@ -66,21 +80,31 @@ 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} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check -%python_exec setup.py test +%if %{with test} +export PYTHONPATH='doc' +%pyunittest sphinxcontrib/autoprogram.py +%endif +%if !%{with test} %files %{python_files} %doc README.rst %license LICENSE %{python_sitelib}/* +%endif +%if !%{with test} %files %{python_files doc} %license LICENSE %doc doc/_build/html/* +%endif %changelog