Date: Tuesday, November 30, 2021 @ 14:46:10 Author: foutrelis Revision: 1057720
archrelease: copy trunk to community-staging-any Added: python-sphinx/repos/community-staging-any/ python-sphinx/repos/community-staging-any/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch (from rev 1057719, python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch) python-sphinx/repos/community-staging-any/PKGBUILD (from rev 1057719, python-sphinx/trunk/PKGBUILD) -----------------------------------------------------------------+ 0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch | 130 ++++++++++ PKGBUILD | 55 ++++ 2 files changed, 185 insertions(+) Copied: python-sphinx/repos/community-staging-any/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch (from rev 1057719, python-sphinx/trunk/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch) =================================================================== --- community-staging-any/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch (rev 0) +++ community-staging-any/0001-Revert-Close-7996-manpage-Make-a-section-directory-o.patch 2021-11-30 14:46:10 UTC (rev 1057720) @@ -0,0 +1,130 @@ +From 413d1008d96a44cba5bf82030f7e95450ae82554 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johan...@kyriasis.com> +Date: Sat, 15 May 2021 12:25:10 +0200 +Subject: [PATCH] Revert "Close #7996: manpage: Make a section directory on + build manpage by default" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit a843fd3db8b588be93b576049a8a291bc4b3ec9d. + +Signed-off-by: Johannes Löthberg <johan...@kyriasis.com> +--- + CHANGES | 2 -- + doc/usage/configuration.rst | 4 +--- + sphinx/builders/manpage.py | 2 +- + tests/test_build_manpage.py | 12 ++++++------ + tests/test_smartquotes.py | 4 ++-- + 5 files changed, 10 insertions(+), 14 deletions(-) + +diff --git a/CHANGES b/CHANGES +index b7e4c7f0e..7ca08a6ac 100644 +--- a/CHANGES ++++ b/CHANGES +@@ -50,8 +50,6 @@ Incompatible changes + * #7784: i18n: The msgid for alt text of image is changed + * #5560: napoleon: :confval:`napoleon_use_param` also affect "other parameters" + section +-* #7996: manpage: Make a section directory on build manpage by default (see +- :confval:`man_make_section_directory`) + * #7849: html: Change the default setting of + :confval:`html_codeblock_linenos_style` to ``'inline'`` + * #8380: html search: search results are wrapped with ``<p>`` instead of +diff --git a/doc/usage/configuration.rst b/doc/usage/configuration.rst +index 7b7a0a1d4..3bc402c9a 100644 +--- a/doc/usage/configuration.rst ++++ b/doc/usage/configuration.rst +@@ -2332,12 +2332,10 @@ These options influence manual page output. + + .. confval:: man_make_section_directory + +- If true, make a section directory on build man page. Default is True. ++ If true, make a section directory on build man page. Default is False. + + .. versionadded:: 3.3 +- .. versionchanged:: 4.0 + +- The default is changed to ``False`` from ``True``. + + .. _texinfo-options: + +diff --git a/sphinx/builders/manpage.py b/sphinx/builders/manpage.py +index b993a2df4..532d2b8fe 100644 +--- a/sphinx/builders/manpage.py ++++ b/sphinx/builders/manpage.py +@@ -118,7 +118,7 @@ def setup(app: Sphinx) -> Dict[str, Any]: + + app.add_config_value('man_pages', default_man_pages, None) + app.add_config_value('man_show_urls', False, None) +- app.add_config_value('man_make_section_directory', True, None) ++ app.add_config_value('man_make_section_directory', False, None) + + return { + 'version': 'builtin', +diff --git a/tests/test_build_manpage.py b/tests/test_build_manpage.py +index 2affb8ba3..a017abc69 100644 +--- a/tests/test_build_manpage.py ++++ b/tests/test_build_manpage.py +@@ -17,9 +17,9 @@ from sphinx.config import Config + @pytest.mark.sphinx('man') + def test_all(app, status, warning): + app.builder.build_all() +- assert (app.outdir / '1' / 'sphinxtests.1').exists() ++ assert (app.outdir / 'sphinxtests.1').exists() + +- content = (app.outdir / '1' / 'sphinxtests.1').read_text() ++ content = (app.outdir / 'sphinxtests.1').read_text() + assert r'\fBprint \fP\fIi\fP\fB\en\fP' in content + assert r'\fBmanpage\en\fP' in content + +@@ -31,16 +31,16 @@ def test_all(app, status, warning): + + + @pytest.mark.sphinx('man', testroot='basic', +- confoverrides={'man_make_section_directory': False}) ++ confoverrides={'man_make_section_directory': True}) + def test_man_make_section_directory(app, status, warning): + app.build() +- assert (app.outdir / 'python.1').exists() ++ assert (app.outdir / '1' / 'python.1').exists() + + + @pytest.mark.sphinx('man', testroot='directive-code') + def test_captioned_code_block(app, status, warning): + app.builder.build_all() +- content = (app.outdir / '1' / 'python.1').read_text() ++ content = (app.outdir / 'python.1').read_text() + + assert ('.sp\n' + 'caption \\fItest\\fP rb\n' +@@ -71,5 +71,5 @@ def test_default_man_pages(): + @pytest.mark.sphinx('man', testroot='markup-rubric') + def test_rubric(app, status, warning): + app.build() +- content = (app.outdir / '1' / 'python.1').read_text() ++ content = (app.outdir / 'python.1').read_text() + assert 'This is a rubric\n' in content +diff --git a/tests/test_smartquotes.py b/tests/test_smartquotes.py +index a8d4b1ed6..4879dedc6 100644 +--- a/tests/test_smartquotes.py ++++ b/tests/test_smartquotes.py +@@ -31,7 +31,7 @@ def test_text_builder(app, status, warning): + def test_man_builder(app, status, warning): + app.build() + +- content = (app.outdir / '1' / 'python.1').read_text() ++ content = (app.outdir / 'python.1').read_text() + assert '\\-\\- "Sphinx" is a tool that makes it easy ...' in content + + +@@ -84,5 +84,5 @@ def test_smartquotes_excludes_language(app, status, warning): + def test_smartquotes_excludes_builders(app, status, warning): + app.build() + +- content = (app.outdir / '1' / 'python.1').read_text() ++ content = (app.outdir / 'python.1').read_text() + assert '– “Sphinx” is a tool that makes it easy …' in content +-- +2.31.1 + Copied: python-sphinx/repos/community-staging-any/PKGBUILD (from rev 1057719, python-sphinx/trunk/PKGBUILD) =================================================================== --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2021-11-30 14:46:10 UTC (rev 1057720) @@ -0,0 +1,55 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Maintainer: Daniel M. Capella <poly...@archlinux.org> +# Contributor: Sébastien Luttringer +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Fabio Volpe <volpefa...@gmail.com> + +pkgname=python-sphinx +pkgver=4.3.1 +pkgrel=3 +pkgdesc='Python documentation generator' +arch=('any') +url=http://www.sphinx-doc.org/ +license=('BSD') +depends=('python-babel' + 'python-docutils' + 'python-imagesize' + 'python-jinja' + 'python-pygments' + 'python-requests' + 'python-setuptools' + 'python-snowballstemmer' + 'python-sphinx-alabaster-theme' + 'python-sphinxcontrib-'{{apple,dev,html}help,jsmath,qthelp,serializinghtml}) +checkdepends=('cython' + 'imagemagick' 'librsvg' + 'python-html5lib' + 'python-pytest' + 'texlive-fontsextra' 'texlive-latexextra') +optdepends=('imagemagick: for ext.imgconverter' + 'texlive-latexextra: for generation of PDF documentation') +source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz"{,.asc}) +sha256sums=('32a5b3e9a1b176cc25ed048557d4d3d01af635e6b76c5bc7a43b0a34447fbd45' + 'SKIP') +b2sums=('eacc9d39e1a108dba1f8d3bd96d7f78f1755f23233c8068dbe598f3d3539d9cf0ea9c12374e0ffc4f471004bbe7cbd6e80ebfa7bcfbf85e5d8c34ed4adfb2acb' + 'SKIP') +validpgpkeys=('8A11B79A5D0D749A66F0A030102C2C17498D6B9E' # Takeshi KOMIYA <i.tkom...@gmail.com> + 'E9BEABB07E7B9CC3F56E62C91425F8CE5EBA0E07') # Takayuki Shimizukawa <shimizuk...@gmail.com> + +build() { + cd Sphinx-$pkgver + make build +} + +check() { + cd Sphinx-$pkgver + LC_ALL="en_US.UTF-8" make test +} + +package() { + cd Sphinx-$pkgver + python setup.py install --root="$pkgdir" --optimize=1 --skip-build + install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE +} + +# vim:set ts=2 sw=2 et: