Date: Tuesday, May 23, 2017 @ 21:53:10 Author: demize Revision: 229860
archrelease: copy trunk to community-any Added: python-sphinx/repos/community-any/PKGBUILD (from rev 229859, python-sphinx/trunk/PKGBUILD) python-sphinx/repos/community-any/fix-broken-latex-testcase.patch (from rev 229859, python-sphinx/trunk/fix-broken-latex-testcase.patch) python-sphinx/repos/community-any/typing-module-py35+.patch (from rev 229859, python-sphinx/trunk/typing-module-py35+.patch) Deleted: python-sphinx/repos/community-any/PKGBUILD ---------------------------------+ PKGBUILD | 296 +++++++++++++++++++------------------- fix-broken-latex-testcase.patch | 40 +++++ typing-module-py35+.patch | 30 +++ 3 files changed, 223 insertions(+), 143 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-05-23 21:53:04 UTC (rev 229859) +++ PKGBUILD 2017-05-23 21:53:10 UTC (rev 229860) @@ -1,143 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Sébastien Luttringer -# Contributor: Angel Velasquez <an...@archlinux.org> -# Contributor: Fabio Volpe <volpefa...@gmail.com> - -pkgbase=python-sphinx -pkgname=('python-sphinx' 'python2-sphinx') -pkgver=1.6.1 -pkgrel=2 - -arch=('any') -url='http://sphinx.pocoo.org/' -license=('BSD') - -makedepends=( - 'python-setuptools' - 'python-docutils' - 'python-jinja' - 'python-pygments' - 'python-six' - 'python-imagesize' - 'python-sphinxcontrib-websupport' - 'python-sqlalchemy' - 'python-whoosh' - 'python2-setuptools' - 'python2-docutils' - 'python2-jinja' - 'python2-pygments' - 'python2-six' - 'python2-imagesize' - 'python2-sphinxcontrib-websupport' - 'python2-sqlalchemy' - 'python2-whoosh' -) - -checkdepends=( - 'texlive-latexextra' - 'python-nose' 'python2-nose' - 'python-snowballstemmer' 'python2-snowballstemmer' - 'python-babel' 'python2-babel' - 'python-sphinx-alabaster-theme' 'python2-sphinx-alabaster-theme' - 'python-sphinx_rtd_theme' 'python2-sphinx_rtd_theme' - 'python-mock' 'python2-mock' - 'python-html5lib' 'python2-html5lib' - 'python-requests' 'python2-requests' - 'python2-pytest' 'python-pytest' - 'python2-enum34' - 'python-sphinxcontrib-websupport' 'python2-sphinxcontrib-websupport' - 'imagemagick' 'librsvg' -) - -source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz") - -md5sums=('26cb1cdca7aa4afc8c925d926b6268e7') - -prepare() { - # souce duplication is required because makefile modify source code - # setyp.py --build tricks don't works well - cp -a Sphinx-$pkgver Sphinx-${pkgver}2 - # change python2 interpreter - find Sphinx-${pkgver}2 -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; - # change sphinx-binaries name in source code - find Sphinx-${pkgver}2 -type f -name '*.py' -exec \ - sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \; -} - -build() { - msg2 'Python 3 version' - cd "$srcdir"/Sphinx-$pkgver - make PYTHON=python3 build - - msg2 'Python 2 version' - cd "$srcdir"/Sphinx-${pkgver}2 - make PYTHON=python2 build -} - -check() { -# msg2 'Python 3 version' -# cd "$srcdir"/Sphinx-$pkgver -# LC_ALL="en_US.UTF-8" make PYTHON=python3 test -# rm -r tests -# - msg2 'Python 2 version' -# cd "$srcdir"/Sphinx-${pkgver}2 -# LC_ALL="en_US.UTF-8" make PYTHON=python2 test -# rm -r tests -} - -package_python-sphinx() { - pkgdesc='Python3 documentation generator' - depends=( - 'python-jinja' - 'python-pygments' - 'python-docutils' - 'python-sphinx_rtd_theme' - 'python-sphinx-alabaster-theme' - 'python-babel' - 'python-snowballstemmer' - 'python-six' - 'python-imagesize' - 'python-requests' - 'python-sphinxcontrib-websupport' - 'python-sqlalchemy' - 'python-whoosh' - ) - optdepends=('texlive-latexextra: for generation of PDF documentation' - 'imagemagick: ext.imageconverter') - - cd Sphinx-$pkgver - python setup.py install --root="$pkgdir" --optimize=1 - - install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python-sphinx/LICENSE -} - -package_python2-sphinx() { - pkgdesc='Python2 documentation generator' - depends=( - 'python2-jinja' - 'python2-pygments' - 'python2-docutils' - 'python2-sphinx_rtd_theme' - 'python2-sphinx-alabaster-theme' - 'python2-babel' - 'python2-snowballstemmer' - 'python2-six' - 'python2-imagesize' - 'python2-requests' - 'python2-sphinxcontrib-websupport' - 'python2-sqlalchemy' - 'python2-whoosh' - ) - optdepends=('texlive-latexextra: for generation of PDF documentation' - 'imagemagick: ext.imageconverter') - - cd Sphinx-${pkgver}2 - python2 setup.py install --root="$pkgdir" --optimize=1 - - install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python2-sphinx/LICENSE -} - -# vim:set ts=2 sw=2 et: Copied: python-sphinx/repos/community-any/PKGBUILD (from rev 229859, python-sphinx/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-05-23 21:53:10 UTC (rev 229860) @@ -0,0 +1,153 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Sébastien Luttringer +# Contributor: Angel Velasquez <an...@archlinux.org> +# Contributor: Fabio Volpe <volpefa...@gmail.com> + +pkgbase=python-sphinx +pkgname=('python-sphinx' 'python2-sphinx') +pkgver=1.6.1 +pkgrel=3 + +arch=('any') +url='http://sphinx.pocoo.org/' +license=('BSD') + +makedepends=( + 'python-setuptools' + 'python-docutils' + 'python-jinja' + 'python-pygments' + 'python-six' + 'python-imagesize' + 'python-sphinxcontrib-websupport' + 'python-sqlalchemy' + 'python-whoosh' + 'python2-setuptools' + 'python2-docutils' + 'python2-jinja' + 'python2-pygments' + 'python2-six' + 'python2-imagesize' + 'python2-sphinxcontrib-websupport' + 'python2-sqlalchemy' + 'python2-whoosh' + 'python2-typing' +) + +checkdepends=( + 'texlive-latexextra' + 'python-nose' 'python2-nose' + 'python-snowballstemmer' 'python2-snowballstemmer' + 'python-babel' 'python2-babel' + 'python-sphinx-alabaster-theme' 'python2-sphinx-alabaster-theme' + 'python-sphinx_rtd_theme' 'python2-sphinx_rtd_theme' + 'python-mock' 'python2-mock' + 'python-html5lib' 'python2-html5lib' + 'python-requests' 'python2-requests' + 'python2-pytest' 'python-pytest' + 'python2-enum34' + 'python-sphinxcontrib-websupport' 'python2-sphinxcontrib-websupport' + 'imagemagick' 'librsvg' +) + +source=("https://pypi.org/packages/source/S/Sphinx/Sphinx-$pkgver.tar.gz" + "typing-module-py35+.patch" + "fix-broken-latex-testcase.patch") + +md5sums=('26cb1cdca7aa4afc8c925d926b6268e7' + '7e9371d2bbae0a790cb2ba9200979803' + '7ec2270be8902c2351f9f4a8c9a33f26') + +prepare() { + (cd Sphinx-$pkgver + patch -p1 <"$srcdir"/fix-broken-latex-testcase.patch + patch -p1 <"$srcdir"/typing-module-py35+.patch) + + # souce duplication is required because makefile modify source code + # setyp.py --build tricks don't works well + cp -a Sphinx-$pkgver Sphinx-${pkgver}2 + # change python2 interpreter + find Sphinx-${pkgver}2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; + # change sphinx-binaries name in source code + find Sphinx-${pkgver}2 -type f -name '*.py' -exec \ + sed -ri 's,(sphinx-(:?build|apidoc|autogen|quickstart)),\12,' {} \; +} + +build() { + msg2 'Python 3 version' + cd "$srcdir"/Sphinx-$pkgver + make PYTHON=python3 build + + msg2 'Python 2 version' + cd "$srcdir"/Sphinx-${pkgver}2 + make PYTHON=python2 build +} + +check() { + msg2 'Python 3 version' + cd "$srcdir"/Sphinx-$pkgver + LC_ALL="en_US.UTF-8" make PYTHON=python3 test + rm -r tests + + msg2 'Python 2 version' + cd "$srcdir"/Sphinx-${pkgver}2 + LC_ALL="en_US.UTF-8" make PYTHON=python2 test + rm -r tests +} + +package_python-sphinx() { + pkgdesc='Python3 documentation generator' + depends=( + 'python-jinja' + 'python-pygments' + 'python-docutils' + 'python-sphinx_rtd_theme' + 'python-sphinx-alabaster-theme' + 'python-babel' + 'python-snowballstemmer' + 'python-six' + 'python-imagesize' + 'python-requests' + 'python-sphinxcontrib-websupport' + 'python-sqlalchemy' + 'python-whoosh' + ) + optdepends=('texlive-latexextra: for generation of PDF documentation' + 'imagemagick: ext.imageconverter') + + cd Sphinx-$pkgver + python setup.py install --root="$pkgdir" --optimize=1 + + install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python-sphinx/LICENSE +} + +package_python2-sphinx() { + pkgdesc='Python2 documentation generator' + depends=( + 'python2-jinja' + 'python2-pygments' + 'python2-docutils' + 'python2-sphinx_rtd_theme' + 'python2-sphinx-alabaster-theme' + 'python2-babel' + 'python2-snowballstemmer' + 'python2-six' + 'python2-imagesize' + 'python2-requests' + 'python2-sphinxcontrib-websupport' + 'python2-sqlalchemy' + 'python2-whoosh' + 'python2-typing' + ) + optdepends=('texlive-latexextra: for generation of PDF documentation' + 'imagemagick: ext.imageconverter') + + cd Sphinx-${pkgver}2 + python2 setup.py install --root="$pkgdir" --optimize=1 + + install -Dm644 "$srcdir"/Sphinx-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/python2-sphinx/LICENSE +} + +# vim:set ts=2 sw=2 et: Copied: python-sphinx/repos/community-any/fix-broken-latex-testcase.patch (from rev 229859, python-sphinx/trunk/fix-broken-latex-testcase.patch) =================================================================== --- fix-broken-latex-testcase.patch (rev 0) +++ fix-broken-latex-testcase.patch 2017-05-23 21:53:10 UTC (rev 229860) @@ -0,0 +1,40 @@ +From dd3b100925194b4c8e411f0064c1d049538b95bf Mon Sep 17 00:00:00 2001 +From: Takeshi KOMIYA <i.tkom...@gmail.com> +Date: Wed, 17 May 2017 00:03:39 +0900 +Subject: [PATCH] Follow translations + +--- + tests/test_build_latex.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/test_build_latex.py b/tests/test_build_latex.py +index 4efe70eda..81522a365 100644 +--- a/tests/test_build_latex.py ++++ b/tests/test_build_latex.py +@@ -310,19 +310,19 @@ def test_numref_with_language_ja(app, status, warning): + print(result) + print(status.getvalue()) + print(warning.getvalue()) +- assert u'\\renewcommand{\\figurename}{\u56f3}' in result +- assert '\\renewcommand{\\tablename}{TABLE}' in result +- assert '\\renewcommand{\\literalblockname}{LIST}' in result ++ assert u'\\renewcommand{\\figurename}{\u56f3}' in result # 図 ++ assert u'\\renewcommand{\\tablename}{\u8868}' in result # 表 ++ assert u'\\renewcommand{\\literalblockname}{\u30ea\u30b9\u30c8}' in result # リスト + assert (u'\\hyperref[\\detokenize{index:fig1}]' + u'{\u56f3 \\ref{\\detokenize{index:fig1}}}') in result + assert ('\\hyperref[\\detokenize{baz:fig22}]' + '{Figure\\ref{\\detokenize{baz:fig22}}}') in result +- assert ('\\hyperref[\\detokenize{index:table-1}]' +- '{TABLE \\ref{\\detokenize{index:table-1}}}') in result ++ assert (u'\\hyperref[\\detokenize{index:table-1}]' ++ u'{\u8868 \\ref{\\detokenize{index:table-1}}}') in result + assert ('\\hyperref[\\detokenize{baz:table22}]' + '{Table:\\ref{\\detokenize{baz:table22}}}') in result +- assert ('\\hyperref[\\detokenize{index:code-1}]' +- '{LIST \\ref{\\detokenize{index:code-1}}}') in result ++ assert (u'\\hyperref[\\detokenize{index:code-1}]' ++ u'{\u30ea\u30b9\u30c8 \\ref{\\detokenize{index:code-1}}}') in result + assert ('\\hyperref[\\detokenize{baz:code22}]' + '{Code-\\ref{\\detokenize{baz:code22}}}') in result + assert (u'\\hyperref[\\detokenize{foo:foo}]' Copied: python-sphinx/repos/community-any/typing-module-py35+.patch (from rev 229859, python-sphinx/trunk/typing-module-py35+.patch) =================================================================== --- typing-module-py35+.patch (rev 0) +++ typing-module-py35+.patch 2017-05-23 21:53:10 UTC (rev 229860) @@ -0,0 +1,30 @@ +From 34346a8ac129047c8ba345562a78c74a9bae8096 Mon Sep 17 00:00:00 2001 +From: Julien Schueller <schuel...@phimeca.com> +Date: Tue, 23 May 2017 09:33:45 +0200 +Subject: [PATCH] Do not require typing module for python>=3.5 + +pkg_resources.DistributionNotFound: The 'typing' distribution was not found and is required by Sphinx +--- + setup.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 95bb3778f..4544ca3b0 100644 +--- a/setup.py ++++ b/setup.py +@@ -51,10 +51,14 @@ + 'alabaster>=0.7,<0.8', + 'imagesize', + 'requests>=2.0.0', +- 'typing', + 'setuptools', + 'sphinxcontrib-websupport', + ] ++ ++# this is a backport to versions older than 3.5 ++if sys.version_info < (3, 5): ++ requires.append('typing') ++ + extras_require = { + # Environment Marker works for wheel 0.24 or later + ':sys_platform=="win32"': [