Date: Saturday, November 9, 2019 @ 10:02:45 Author: arojas Revision: 524793
Drop python2, update to 0.6 Modified: python-recommonmark/trunk/PKGBUILD python-recommonmark/trunk/recommonmark-sphinx-2.patch Deleted: python-recommonmark/trunk/recommonmark-fix-mdnode-parent.patch python-recommonmark/trunk/recommonmark-sphinx-refdomain-fix.patch -----------------------------------------+ PKGBUILD | 66 ++++++--------------------- recommonmark-fix-mdnode-parent.patch | 25 ---------- recommonmark-sphinx-2.patch | 34 +++++++++++++- recommonmark-sphinx-refdomain-fix.patch | 72 ------------------------------ 4 files changed, 47 insertions(+), 150 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-09 09:09:19 UTC (rev 524792) +++ PKGBUILD 2019-11-09 10:02:45 UTC (rev 524793) @@ -1,28 +1,22 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -pkgbase=python-recommonmark -pkgname=('python-recommonmark' 'python2-recommonmark') -pkgver=0.4.0.133.c410abb -pkgrel=6 -_gitcommit=c410abb565a3c4ad4de0ce204ab2fa2db8031cf1 +pkgname=python-recommonmark +pkgver=0.6.0.194.48f9d1a +pkgrel=1 +_gitcommit=48f9d1a6848c77a104854f556c053f3ed3c2c354 pkgdesc='Markdown parser for docutils' url='https://github.com/readthedocs/recommonmark' arch=('any') license=('MIT') -makedepends=('git' - 'python-setuptools' 'python-commonmark' 'python-docutils' 'python-sphinx' - 'python2-setuptools' 'python2-commonmark' 'python2-docutils' 'python2-sphinx') -checkdepends=('python-pytest' 'python2-pytest') -source=(${pkgbase}::"git+https://github.com/readthedocs/recommonmark#commit=$_gitcommit" +depends=('python-docutils' 'python-commonmark' 'python-setuptools' 'python-sphinx') +makedepends=('git') +checkdepends=('python-pytest') +source=(${pkgname}::"git+https://github.com/readthedocs/recommonmark#commit=$_gitcommit" recommonmark-disable-math-on-builds.patch - recommonmark-sphinx-refdomain-fix.patch - recommonmark-fix-mdnode-parent.patch recommonmark-sphinx-2.patch) sha512sums=('SKIP' '66ef07ac21643b913c8ee551c7c71753fcb6442712e4fb11b84ea5f34265715471759b2c5a1badc1e299ca6aa831713b12284144801616349b2db61738607e8a' - 'df2440e7ce927ca6adc31e07f9e375fa4643bbe1c33a34821d3d3e5d9d4b2ae8bbdf7412a8f2c64d343c9004f54a4a650fc59e461b3b1eb1ab11c1dec02422fd' - '89745108ad78349ace30582cb28f8693edc109c97e94182a37afe5219bec8988bb785d77594e34306facf0eaa4e640c0bdf4e53249d6154094222e58df9498e9' - 'cff81ff659acd39557fbaf5c2b85a8c4f2b5ff0f950a2ecb10131f2673582173686c3cf46c7c8811d01f9ebab4675dfbcc097612005504121978f2957001ddf6') + '608c44a861f589964ffd30818917dd46aa0df2a249d74cf54f1dbd2e595dc3e1914357df563608d0c3f10bc3d387aece36d69178161c9d4fa824224a72c367e5') pkgver() { cd ${pkgbase} @@ -34,42 +28,23 @@ prepare() { patch -d ${pkgbase} -p1 < "${srcdir}/recommonmark-disable-math-on-builds.patch" - patch -d ${pkgbase} -p1 < "${srcdir}/recommonmark-sphinx-refdomain-fix.patch" - patch -d ${pkgbase} -p1 < "${srcdir}/recommonmark-fix-mdnode-parent.patch" - cp -a ${pkgbase}{,-py2} - for tool in cm2{html,latex,man,pseudoxml,xetex,xml}; do - sed -r "s|(${tool}) |\12 |g" -i ${pkgbase}-py2/setup.py - done patch -d ${pkgbase} -p1 < "${srcdir}/recommonmark-sphinx-2.patch" # Fix tests with Sphinx 2 } build() { msg2 "Building python..." - (cd ${pkgbase} - python setup.py build - make -j1 -C docs text man SPHINXBUILD=sphinx-build - ) - msg2 "Building python2..." - (cd ${pkgbase}-py2 - python2 setup.py build - make -j1 -C docs text man SPHINXBUILD=sphinx-build2 - ) + cd ${pkgbase} + python setup.py build + make -j1 -C docs text man SPHINXBUILD=sphinx-build } check() { msg2 "Checking python..." - (cd ${pkgbase} - py.test - ) - msg2 "Checking python2..." - (cd ${pkgbase}-py2 - py.test2 - ) + cd ${pkgbase} + py.test } -package_python-recommonmark() { - depends=('python-docutils' 'python-commonmark' 'python-setuptools' 'python-sphinx') - +package() { cd ${pkgbase} python setup.py install --root="${pkgdir}" --skip-build -O1 install -Dm 644 license.md -t "${pkgdir}/usr/share/licenses/${pkgname}" @@ -78,15 +53,4 @@ install -Dm 644 docs/_build/man/recommonmark.1 "${pkgdir}/usr/share/man/man1/${pkgname}.1" } -package_python2-recommonmark() { - depends=('python2-docutils' 'python2-commonmark' 'python2-setuptools' 'python2-sphinx') - - cd ${pkgbase}-py2 - python2 setup.py install --root="${pkgdir}" --skip-build -O1 - install -Dm 644 license.md -t "${pkgdir}/usr/share/licenses/${pkgname}" - install -Dm 644 README.md CHANGELOG.md -t "${pkgdir}/usr/share/doc/${pkgname}" - install -Dm 644 docs/_build/text/*.txt -t "${pkgdir}/usr/share/doc/${pkgname}" - install -Dm 644 docs/_build/man/recommonmark.1 "${pkgdir}/usr/share/man/man1/${pkgname}.1" -} - # vim: ts=2 sw=2 et: Deleted: recommonmark-fix-mdnode-parent.patch =================================================================== --- recommonmark-fix-mdnode-parent.patch 2019-11-09 09:09:19 UTC (rev 524792) +++ recommonmark-fix-mdnode-parent.patch 2019-11-09 10:02:45 UTC (rev 524793) @@ -1,25 +0,0 @@ -From c38a2fe8c0427d74edf94627d3bc4bf43306d385 Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@leventepolyak.net> -Date: Mon, 11 Sep 2017 23:25:14 +0200 -Subject: [PATCH] guard mdnode.parent.sourcepos if not existent - ---- - recommonmark/parser.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/recommonmark/parser.py b/recommonmark/parser.py -index e54fdf4..f651467 100644 ---- a/recommonmark/parser.py -+++ b/recommonmark/parser.py -@@ -131,7 +131,7 @@ class CommonMarkParser(parsers.Parser): - # these mdnodes won't have sourcepos on them for whatever reason. This - # is better than 0 though. - ref_node.line = (mdnode.sourcepos[0][0] if mdnode.sourcepos -- else mdnode.parent.sourcepos[0][0]) -+ else mdnode.parent.sourcepos[0][0] if mdnode.parent.sourcepos else 0) - if mdnode.title: - ref_node['title'] = mdnode.title - next_node = ref_node --- -2.14.1 - Modified: recommonmark-sphinx-2.patch =================================================================== --- recommonmark-sphinx-2.patch 2019-11-09 09:09:19 UTC (rev 524792) +++ recommonmark-sphinx-2.patch 2019-11-09 10:02:45 UTC (rev 524793) @@ -1,5 +1,25 @@ +diff --git a/tests/test_basic.py b/tests/test_basic.py +index 0f8bf60..cfa447d 100644 +--- a/tests/test_basic.py ++++ b/tests/test_basic.py +@@ -255,9 +255,12 @@ class TestParsing(unittest.TestCase): + </pending_xref> + + +- <pending_xref refdomain="None" refexplicit="True" reftarget="path/to/file:heading with spaces" reftype="any" refwarn="True"> +- <reference refuri="path/to/file:heading%20with%20spaces">ref link with spaces</reference> +- </pending_xref> ++ [ ++ ref link with spaces ++ ] ++ ( ++ < ++ path/to/file:heading with spaces>) + </paragraph> + </document> + """ diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py -index 06078b1..fd62378 100644 +index 06078b1..201f27b 100644 --- a/tests/test_sphinx.py +++ b/tests/test_sphinx.py @@ -142,17 +142,17 @@ class GenericTests(SphinxIntegrationTests): @@ -26,7 +46,7 @@ '</ol>'), output ) -@@ -207,8 +207,8 @@ class CustomExtensionTests(SphinxIntegrationTests): +@@ -207,16 +207,16 @@ class CustomExtensionTests(SphinxIntegrationTests): def test_integration(self): output = self.read_file('index.html') self.assertIn('<table ', output) @@ -37,3 +57,13 @@ self.assertIn('</table>', output) self.assertIn( + ('<div class="contents topic" id="contents">\n' + '<p class="topic-title first">Contents</p>\n' + '<ul class="simple">\n' +- '<li><a class="reference internal" href="#header" id="id1">Header</a><ul>\n' +- '<li><a class="reference internal" href="#header-2" id="id2">Header 2</a></li>\n' ++ '<li><p><a class="reference internal" href="#header" id="id1">Header</a></p>\n<ul>\n' ++ '<li><p><a class="reference internal" href="#header-2" id="id2">Header 2</a></p></li>\n' + '</ul>\n</li>\n</ul>'), + output + ) Deleted: recommonmark-sphinx-refdomain-fix.patch =================================================================== --- recommonmark-sphinx-refdomain-fix.patch 2019-11-09 09:09:19 UTC (rev 524792) +++ recommonmark-sphinx-refdomain-fix.patch 2019-11-09 10:02:45 UTC (rev 524793) @@ -1,72 +0,0 @@ -From 90d07fbe8fccaeb0da0ed7708e4c2a89f33c2426 Mon Sep 17 00:00:00 2001 -From: anthraxx <leve...@leventepolyak.net> -Date: Mon, 7 Aug 2017 15:50:41 +0200 -Subject: [PATCH] fix for modern sphinx require refdomain - ---- - recommonmark/parser.py | 1 + - tests/test_basic.py | 10 +++++----- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/recommonmark/parser.py b/recommonmark/parser.py -index e54fdf4..c3c27ac 100644 ---- a/recommonmark/parser.py -+++ b/recommonmark/parser.py -@@ -141,6 +141,7 @@ class CommonMarkParser(parsers.Parser): - wrap_node = addnodes.pending_xref( - reftarget=mdnode.destination, - reftype='any', -+ refdomain='', - refexplicit=True, - refwarn=True - ) -diff --git a/tests/test_basic.py b/tests/test_basic.py -index 0e703dc..ca1a08c 100644 ---- a/tests/test_basic.py -+++ b/tests/test_basic.py -@@ -183,7 +183,7 @@ class TestParsing(unittest.TestCase): - <?xml version="1.0" ?> - <document source="<string>"> - <paragraph> -- <pending_xref refexplicit="True" reftarget="/foo" reftype="any" refwarn="True"> -+ <pending_xref refdomain="" refexplicit="True" reftarget="/foo" reftype="any" refwarn="True"> - <reference refuri="/foo">link</reference> - </pending_xref> - </paragraph> -@@ -198,7 +198,7 @@ class TestParsing(unittest.TestCase): - <?xml version="1.0" ?> - <document source="<string>"> - <paragraph> -- <pending_xref refexplicit="True" reftarget="foo" reftype="any" refwarn="True"> -+ <pending_xref refdomain="" refexplicit="True" reftarget="foo" reftype="any" refwarn="True"> - <reference refuri="foo">link</reference> - </pending_xref> - </paragraph> -@@ -274,21 +274,21 @@ class TestParsing(unittest.TestCase): - <bullet_list> - <list_item> - <paragraph> -- <pending_xref refexplicit="True" reftarget="/1" reftype="any" refwarn="True"> -+ <pending_xref refdomain="" refexplicit="True" reftarget="/1" reftype="any" refwarn="True"> - <reference refuri="/1">List item 1</reference> - </pending_xref> - </paragraph> - </list_item> - <list_item> - <paragraph> -- <pending_xref refexplicit="True" reftarget="/2" reftype="any" refwarn="True"> -+ <pending_xref refdomain="" refexplicit="True" reftarget="/2" reftype="any" refwarn="True"> - <reference refuri="/2">List item 2</reference> - </pending_xref> - </paragraph> - </list_item> - <list_item> - <paragraph> -- <pending_xref refexplicit="True" reftarget="/3" reftype="any" refwarn="True"> -+ <pending_xref refdomain="" refexplicit="True" reftarget="/3" reftype="any" refwarn="True"> - <reference refuri="/3">List item 3</reference> - </pending_xref> - </paragraph> --- -2.13.3 -