diff --git a/python-sphinxcontrib-autoprogram-0.1.8.tar.gz b/python-sphinxcontrib-autoprogram-0.1.8.tar.gz deleted file mode 100644 index 6f1be0a..0000000 --- a/python-sphinxcontrib-autoprogram-0.1.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6c4e050ba4a6ae8cd8b1034fa1ab20371e3e2cc85ee23affd8bc4e6fe1c9255 -size 18183 diff --git a/python-sphinxcontrib-autoprogram-0.1.9.tar.gz b/python-sphinxcontrib-autoprogram-0.1.9.tar.gz new file mode 100644 index 0000000..9e2eee1 --- /dev/null +++ b/python-sphinxcontrib-autoprogram-0.1.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e27c34c3abda19e655f3ba19573f66901e5287cc75fc19bb13685756dc4d7c69 +size 18303 diff --git a/python-sphinxcontrib-autoprogram-no-six.patch b/python-sphinxcontrib-autoprogram-no-six.patch deleted file mode 100644 index 671c1fe..0000000 --- a/python-sphinxcontrib-autoprogram-no-six.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: autoprogram-0.1.8/sphinxcontrib/autoprogram.py -=================================================================== ---- autoprogram-0.1.8.orig/sphinxcontrib/autoprogram.py -+++ autoprogram-0.1.8/sphinxcontrib/autoprogram.py -@@ -25,8 +25,8 @@ from docutils import nodes - from docutils.parsers.rst import Directive - from docutils.parsers.rst.directives import unchanged - from docutils.statemachine import StringList, ViewList --from six import exec_ --from six.moves import builtins, reduce -+from functools import reduce -+import builtins - from sphinx.domains import std - from sphinx.util.nodes import nested_parse_with_titles - -@@ -154,7 +153,7 @@ def import_object(import_name: str): - with open(f[0]) as fobj: - codestring = fobj.read() - foo = imp.new_module("foo") -- exec_(codestring, foo.__dict__) -+ exec(codestring, foo.__dict__) - - sys.modules["foo"] = foo - mod = __import__("foo") -Index: autoprogram-0.1.8/setup.py -=================================================================== ---- autoprogram-0.1.8.orig/setup.py -+++ autoprogram-0.1.8/setup.py -@@ -9,7 +6,7 @@ from setuptools import setup, find_packa - # Do not change the variable name. It's parsed by doc/conf.py script. - version = '0.1.8' - --requires = ['Sphinx >= 1.2', 'six'] -+requires = ['Sphinx >= 1.2'] - - - def readme(): diff --git a/python-sphinxcontrib-autoprogram.changes b/python-sphinxcontrib-autoprogram.changes index 14ad60b..cf2b7c6 100644 --- a/python-sphinxcontrib-autoprogram.changes +++ b/python-sphinxcontrib-autoprogram.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 1 08:10:31 UTC 2024 - Dirk Müller + +- update to 0.1.9: + * Test against Python 3.12. + * Drop support for Python 3.7. +- drop sphinx6.patch, + python-sphinxcontrib-autoprogram-no-six.patch (upstream) + ------------------------------------------------------------------- Thu Apr 6 09:42:32 UTC 2023 - pgajdos@suse.com diff --git a/python-sphinxcontrib-autoprogram.spec b/python-sphinxcontrib-autoprogram.spec index 95eb08a..1c8860f 100644 --- a/python-sphinxcontrib-autoprogram.spec +++ b/python-sphinxcontrib-autoprogram.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package python-sphinxcontrib-autoprogram # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,9 @@ %define psuffix -%{flavor} %endif %global short_name autoprogram -# https://github.com/sphinx-contrib/autoprogram/commit/457822502b71a449d97dfece63e77dbee910b581 -%define skip_python36 1 -%define skip_python2 1 +%{?sle15_python_module_pythons} Name: python-sphinxcontrib-%{short_name}%{psuffix} -Version: 0.1.8 +Version: 0.1.9 Release: 0 %if "%{flavor}" == "" || "%{flavor}" == "test" Summary: Sphinx extension to document CLI programs @@ -40,10 +38,6 @@ Source0: %{URL}/archive/%{version}/python-sphinxcontrib-%{short_name}-%{v # PATCH-FIX-UPSTREAM skip-failing-test.patch gh#sphinx-contrib/autoprogram#54 mcepl@suse.com # Switch off failing tests by the environmental variable SKIPTESTS Patch1: skip-failing-test.patch -# PATCH-FIX-UPSTREAM sphinx6.patch gh#sphinx-contrib/autoprogram#62 -Patch2: sphinx6.patch -# https://github.com/sphinx-contrib/autoprogram/issues/63 -Patch3: python-sphinxcontrib-autoprogram-no-six.patch BuildRequires: %{python_module Sphinx >= 1.2} BuildRequires: %{python_module setuptools} BuildRequires: fdupes diff --git a/sphinx6.patch b/sphinx6.patch deleted file mode 100644 index 360893a..0000000 --- a/sphinx6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ca22060f8be35e2ba8009a50d3b0c4638219fe5d Mon Sep 17 00:00:00 2001 -From: Daniel Garcia Moreno -Date: Mon, 6 Mar 2023 11:25:04 +0100 -Subject: [PATCH] doc: Fix build with sphinx > 6.0 - -Fix https://github.com/sphinx-contrib/autoprogram/issues/61 ---- - doc/conf.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: autoprogram-0.1.8/doc/conf.py -=================================================================== ---- autoprogram-0.1.8.orig/doc/conf.py -+++ autoprogram-0.1.8/doc/conf.py -@@ -282,18 +282,18 @@ intersphinx_mapping = { - extlinks = { - 'pull': ( - 'https://github.com/sphinx-contrib/autoprogram/pull/%s', -- '#' -+ '#%s' - ), - 'issue': ( - 'https://github.com/sphinx-contrib/autoprogram/issues/%s', -- '#' -+ '#%s' - ), - 'bbpull': ( - 'https://bitbucket.org/birkenfeld/sphinx-contrib/pull-request/%s/', -- 'Bitbucket PR #', -+ 'Bitbucket PR #%s', - ), - 'bbissue': ( - 'https://bitbucket.org/birkenfeld/sphinx-contrib/issue/%s/', -- 'Bitbucket issue #', -+ 'Bitbucket issue #%s', - ), - }