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 2023-03-06 18:56:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sphinxcontrib-autoprogram (Old)
and
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-autoprogram.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sphinxcontrib-autoprogram"
Mon Mar 6 18:56:27 2023 rev:6 rq:1069584 version:0.1.8
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-sphinxcontrib-autoprogram/python-sphinxcontrib-autoprogram.changes
2022-12-13 18:57:38.383898902 +0100
+++
/work/SRC/openSUSE:Factory/.python-sphinxcontrib-autoprogram.new.31432/python-sphinxcontrib-autoprogram.changes
2023-03-06 18:56:31.652963564 +0100
@@ -1,0 +2,9 @@
+Mon Feb 20 10:40:25 UTC 2023 - Daniel Garcia <daniel.gar...@suse.com>
+
+- Add sphinx6.patch to support Sphinx >= 6.0, gh#sphinx-contrib/autoprogram#62
+- Delete python-sphinxcontrib-autoprogram-python310.patch
+- skip-failing-test.patch
+- Update to 0.1.8
+ * Test against Python 3.10, 3.11.
+
+-------------------------------------------------------------------
Old:
----
python-sphinxcontrib-autoprogram-0.1.7.tar.gz
python-sphinxcontrib-autoprogram-python310.patch
New:
----
python-sphinxcontrib-autoprogram-0.1.8.tar.gz
sphinx6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sphinxcontrib-autoprogram.spec ++++++
--- /var/tmp/diff_new_pack.TFON0n/_old 2023-03-06 18:56:32.316966952 +0100
+++ /var/tmp/diff_new_pack.TFON0n/_new 2023-03-06 18:56:32.324966993 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@
%define skip_python36 1
%define skip_python2 1
Name: python-sphinxcontrib-%{short_name}%{psuffix}
-Version: 0.1.7
+Version: 0.1.8
Release: 0
%if "%{flavor}" == "" || "%{flavor}" == "test"
Summary: Sphinx extension to document CLI programs
@@ -37,11 +37,11 @@
License: BSD-2-Clause
URL: https://github.com/sphinx-contrib/%{short_name}
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
# PATCH-FIX-UPSTREAM skip-failing-test.patch gh#sphinx-contrib/autoprogram#54
mc...@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
BuildRequires: %{python_module Sphinx >= 1.2}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -51,11 +51,12 @@
BuildArch: noarch
%if "%{flavor}" == "test"
BuildRequires: %{python_module six}
-BuildRequires: %{python_module sphinxcontrib-autoprogram}
+BuildRequires: %{python_module sphinxcontrib-autoprogram == %{version}}
BuildRequires: %{python_module sphinxcontrib-websupport >= 1.0.1}
%endif
%if "%{flavor}" == "doc"
-BuildRequires: %{python_module sphinxcontrib-autoprogram}
+BuildRequires: %{python_module sphinxcontrib-autoprogram == %{version}}
+BuildRequires: %{python_module sphinxcontrib-websupport}
%endif
%python_subpackages
++++++ python-sphinxcontrib-autoprogram-0.1.7.tar.gz ->
python-sphinxcontrib-autoprogram-0.1.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoprogram-0.1.7/.github/workflows/build.yml
new/autoprogram-0.1.8/.github/workflows/build.yml
--- old/autoprogram-0.1.7/.github/workflows/build.yml 2021-02-10
18:12:43.000000000 +0100
+++ new/autoprogram-0.1.8/.github/workflows/build.yml 2023-02-11
17:56:59.000000000 +0100
@@ -14,7 +14,7 @@
runs-on: ubuntu-latest
strategy:
matrix:
- python-version: [3.7, 3.8, 3.9]
+ python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v2
@@ -69,7 +69,7 @@
working-directory: ${{ github.workspace }}/tmp/sdist
- name: Publish package
- if: github.event_name == 'release' && startsWith(github.ref,
'refs/tags') && matrix.python-version == 3.9
+ if: github.event_name == 'release' && startsWith(github.ref,
'refs/tags') && matrix.python-version == 3.11
uses: pypa/gh-action-pypi-publish@v1.4.2
with:
user: __token__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoprogram-0.1.7/doc/changelog.rst
new/autoprogram-0.1.8/doc/changelog.rst
--- old/autoprogram-0.1.7/doc/changelog.rst 2021-02-10 18:12:43.000000000
+0100
+++ new/autoprogram-0.1.8/doc/changelog.rst 2023-02-11 17:56:59.000000000
+0100
@@ -1,13 +1,13 @@
Changelog
=========
-..
- TODO Uncomment this:
+Version 0.1.8
+-------------
+
+Released on February 11, 2023.
- Version 0.1.8
- -------------
+- Test against Python 3.10, 3.11.
- To be released.
Version 0.1.7
-------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoprogram-0.1.7/setup.py
new/autoprogram-0.1.8/setup.py
--- old/autoprogram-0.1.7/setup.py 2021-02-10 18:12:43.000000000 +0100
+++ new/autoprogram-0.1.8/setup.py 2023-02-11 17:56:59.000000000 +0100
@@ -7,7 +7,7 @@
# Do not change the variable name. It's parsed by doc/conf.py script.
-version = '0.1.7'
+version = '0.1.8'
requires = ['Sphinx >= 1.2', 'six']
@@ -35,20 +35,18 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
- 'Programming Language :: Python :: 3.3',
- 'Programming Language :: Python :: 3.4',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: Implementation :: CPython',
'Programming Language :: Python :: Implementation :: Stackless',
'Topic :: Documentation',
'Topic :: Software Development :: Documentation',
'Topic :: Utilities'
],
+ python_requires='>=3.7',
platforms='any',
packages=find_packages(),
namespace_packages=['sphinxcontrib'],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoprogram-0.1.7/sphinxcontrib/autoprogram.py
new/autoprogram-0.1.8/sphinxcontrib/autoprogram.py
--- old/autoprogram-0.1.7/sphinxcontrib/autoprogram.py 2021-02-10
18:12:43.000000000 +0100
+++ new/autoprogram-0.1.8/sphinxcontrib/autoprogram.py 2023-02-11
17:56:59.000000000 +0100
@@ -19,6 +19,7 @@
import sys
from typing import Any, Dict, Iterable, List, Optional, Tuple
import unittest
+from unittest import mock
from docutils import nodes
from docutils.parsers.rst import Directive
@@ -476,7 +477,11 @@
# 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(
@@ -534,7 +539,7 @@
0,
".. autoprogram:: cli:parser\n :prog: cli.py\n",
None,
- None,
+ mock.Mock(),
)
def tearDown(self) -> None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoprogram-0.1.7/tox.ini
new/autoprogram-0.1.8/tox.ini
--- old/autoprogram-0.1.7/tox.ini 2021-02-10 18:12:43.000000000 +0100
+++ new/autoprogram-0.1.8/tox.ini 2023-02-11 17:56:59.000000000 +0100
@@ -7,9 +7,7 @@
# them.
[tox]
-envlist =
- {py37,py38,py39}-{sphinx34,sphinx33,sphinx32,sphinx24,sphinx18}
- black flake8 mypy pylint
+envlist =
{py37,py38,py39,py310,py311}-{sphinx34,sphinx33,sphinx32,sphinx24,sphinx18}
minversion = 2.7.0
[testenv]
++++++ sphinx6.patch ++++++
>From ca22060f8be35e2ba8009a50d3b0c4638219fe5d Mon Sep 17 00:00:00 2001
From: Daniel Garcia Moreno <daniel.gar...@suse.com>
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',
),
}
