[arch-commits] Commit in python-recommonmark/trunk (2 files)
Date: Sunday, November 10, 2019 @ 16:22:17 Author: arojas Revision: 526471 Rebuild with python 3.8 (FS#64442) Modified: python-recommonmark/trunk/PKGBUILD python-recommonmark/trunk/recommonmark-sphinx-2.patch -+ PKGBUILD|4 ++-- recommonmark-sphinx-2.patch | 20 2 files changed, 2 insertions(+), 22 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-10 15:50:02 UTC (rev 526470) +++ PKGBUILD2019-11-10 16:22:17 UTC (rev 526471) @@ -2,7 +2,7 @@ pkgname=python-recommonmark pkgver=0.6.0.194.48f9d1a -pkgrel=1 +pkgrel=2 _gitcommit=48f9d1a6848c77a104854f556c053f3ed3c2c354 pkgdesc='Markdown parser for docutils' url='https://github.com/readthedocs/recommonmark' @@ -16,7 +16,7 @@ recommonmark-sphinx-2.patch) sha512sums=('SKIP' '66ef07ac21643b913c8ee551c7c71753fcb6442712e4fb11b84ea5f34265715471759b2c5a1badc1e299ca6aa831713b12284144801616349b2db61738607e8a' - '608c44a861f589964ffd30818917dd46aa0df2a249d74cf54f1dbd2e595dc3e1914357df563608d0c3f10bc3d387aece36d69178161c9d4fa824224a72c367e5') + '317b7139819bb183184e0a5abf4f74b955746779c841cf3b9e7e8032cc23ac3ce5f54a1ebd2d4c012038041c58ab849a09271d806f9fc3c5c0dadd1ad92eddae') pkgver() { cd ${pkgbase} Modified: recommonmark-sphinx-2.patch === --- recommonmark-sphinx-2.patch 2019-11-10 15:50:02 UTC (rev 526470) +++ recommonmark-sphinx-2.patch 2019-11-10 16:22:17 UTC (rev 526471) @@ -1,23 +1,3 @@ -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): - - - -- -- ref link with spaces -- -+[ -+ref link with spaces -+] -+( -+ -+path/to/file:heading with spaces) - - - """ diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py index 06078b1..201f27b 100644 --- a/tests/test_sphinx.py
[arch-commits] Commit in python-recommonmark/trunk (2 files)
Date: Sunday, November 3, 2019 @ 16:09:14 Author: arojas Revision: 522539 Make tests pass with sphinx 2 Added: python-recommonmark/trunk/recommonmark-sphinx-2.patch Modified: python-recommonmark/trunk/PKGBUILD -+ PKGBUILD|7 +-- recommonmark-sphinx-2.patch | 39 +++ 2 files changed, 44 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-03 16:08:59 UTC (rev 522538) +++ PKGBUILD2019-11-03 16:09:14 UTC (rev 522539) @@ -16,11 +16,13 @@ source=(${pkgbase}::"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-fix-mdnode-parent.patch +recommonmark-sphinx-2.patch) sha512sums=('SKIP' '66ef07ac21643b913c8ee551c7c71753fcb6442712e4fb11b84ea5f34265715471759b2c5a1badc1e299ca6aa831713b12284144801616349b2db61738607e8a' 'df2440e7ce927ca6adc31e07f9e375fa4643bbe1c33a34821d3d3e5d9d4b2ae8bbdf7412a8f2c64d343c9004f54a4a650fc59e461b3b1eb1ab11c1dec02422fd' - '89745108ad78349ace30582cb28f8693edc109c97e94182a37afe5219bec8988bb785d77594e34306facf0eaa4e640c0bdf4e53249d6154094222e58df9498e9') + '89745108ad78349ace30582cb28f8693edc109c97e94182a37afe5219bec8988bb785d77594e34306facf0eaa4e640c0bdf4e53249d6154094222e58df9498e9' + 'cff81ff659acd39557fbaf5c2b85a8c4f2b5ff0f950a2ecb10131f2673582173686c3cf46c7c8811d01f9ebab4675dfbcc097612005504121978f2957001ddf6') pkgver() { cd ${pkgbase} @@ -38,6 +40,7 @@ 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() { Added: recommonmark-sphinx-2.patch === --- recommonmark-sphinx-2.patch (rev 0) +++ recommonmark-sphinx-2.patch 2019-11-03 16:09:14 UTC (rev 522539) @@ -0,0 +1,39 @@ +diff --git a/tests/test_sphinx.py b/tests/test_sphinx.py +index 06078b1..fd62378 100644 +--- a/tests/test_sphinx.py b/tests/test_sphinx.py +@@ -142,17 +142,17 @@ class GenericTests(SphinxIntegrationTests): + output = self.read_file('index.html') + self.assertIn( + ('\n' +- 'Item A\n' +- 'Item B\n' +- 'Item C\n' ++ 'Item A\n' ++ 'Item B\n' ++ 'Item C\n' + ''), + output + ) + self.assertIn( + ('\n' +- 'Item 1\n' +- 'Item 2\n' +- 'Item 3\n' ++ 'Item 1\n' ++ 'Item 2\n' ++ 'Item 3\n' + ''), + output + ) +@@ -207,8 +207,8 @@ class CustomExtensionTests(SphinxIntegrationTests): + def test_integration(self): + output = self.read_file('index.html') + self.assertIn('abc', output) +-self.assertIn('data', output) ++self.assertIn('abc', output) ++self.assertIn('data', output) + self.assertIn('', output) + + self.assertIn(
[arch-commits] Commit in python-recommonmark/trunk (2 files)
Date: Saturday, October 26, 2019 @ 06:02:05 Author: foutrelis Revision: 520191 Fix build with newer Sphinx; update source URL Added: python-recommonmark/trunk/recommonmark-disable-math-on-builds.patch Modified: python-recommonmark/trunk/PKGBUILD ---+ PKGBUILD |7 ++- recommonmark-disable-math-on-builds.patch | 59 2 files changed, 64 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-26 05:48:54 UTC (rev 520190) +++ PKGBUILD2019-10-26 06:02:05 UTC (rev 520191) @@ -6,7 +6,7 @@ pkgrel=4 _gitcommit=c410abb565a3c4ad4de0ce204ab2fa2db8031cf1 pkgdesc='Markdown parser for docutils' -url='https://github.com/rtfd/recommonmark' +url='https://github.com/readthedocs/recommonmark' arch=('any') license=('MIT') makedepends=('git' @@ -13,10 +13,12 @@ '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/rtfd/recommonmark#commit=$_gitcommit; +source=(${pkgbase}::"git+https://github.com/readthedocs/recommonmark#commit=$_gitcommit; +recommonmark-disable-math-on-builds.patch recommonmark-sphinx-refdomain-fix.patch recommonmark-fix-mdnode-parent.patch) sha512sums=('SKIP' + '66ef07ac21643b913c8ee551c7c71753fcb6442712e4fb11b84ea5f34265715471759b2c5a1badc1e299ca6aa831713b12284144801616349b2db61738607e8a' 'df2440e7ce927ca6adc31e07f9e375fa4643bbe1c33a34821d3d3e5d9d4b2ae8bbdf7412a8f2c64d343c9004f54a4a650fc59e461b3b1eb1ab11c1dec02422fd' '89745108ad78349ace30582cb28f8693edc109c97e94182a37afe5219bec8988bb785d77594e34306facf0eaa4e640c0bdf4e53249d6154094222e58df9498e9') @@ -29,6 +31,7 @@ } 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} Added: recommonmark-disable-math-on-builds.patch === --- recommonmark-disable-math-on-builds.patch (rev 0) +++ recommonmark-disable-math-on-builds.patch 2019-10-26 06:02:05 UTC (rev 520191) @@ -0,0 +1,59 @@ +From 5a14811519a219b88c96b5b9bc3103ce5d758dc4 Mon Sep 17 00:00:00 2001 +From: Eric Holscher +Date: Fri, 9 Aug 2019 11:37:09 -0700 +Subject: [PATCH] Disable math on builds to fix doc building + +--- + docs/auto_structify.md | 6 ++ + docs/conf.py | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/docs/auto_structify.md b/docs/auto_structify.md +index 52eba2e..c4d58e5 100644 +--- a/docs/auto_structify.md b/docs/auto_structify.md +@@ -134,6 +134,8 @@ def function(): + ### Math Formula + You can normally write latex math formula with `math` codeblock. See also [Inline Math](#inline-math). + ++**Warning**: Math is currently broken on some Sphinx builds ++ + Example + + +@@ -149,6 +151,7 @@ E = m c^2 + ``` + + ### Embed reStructuredText ++ + Recommonmark also allows embedding reStructuredText syntax in the codeblocks. + There are two styles for embedding reStructuredText. The first is enabled by `eval_rst` codeblock. The content of codeblock will be parsed as reStructuredText and insert into the document. This can be used to quickly introduce some of reStructuredText command that not yet available in markdown. For example, + +@@ -243,11 +246,14 @@ The `` line clears the sidebar for the next tit + + Inline Math + --- ++ + Besides the [Math Formula](#math-formula), you can also write latex math in inline codeblock text. You can do so by inserting `$` + in the beginning and end of inline codeblock. + + Example + ++**Warning**: Math is currently broken on some Sphinx builds ++ + ``` + This formula `$ y=\sum_{i=1}^n g(x_i) $` + ``` +diff --git a/docs/conf.py b/docs/conf.py +index 5c2f8c1..a67cc99 100644 +--- a/docs/conf.py b/docs/conf.py +@@ -295,6 +295,8 @@ def setup(app): + app.add_config_value('recommonmark_config', { + #'url_resolver': lambda url: github_doc_root + url, + 'auto_toc_tree_section': 'Contents', ++'enable_math': False, ++'enable_inline_math': False, + 'enable_eval_rst': True, + 'enable_auto_doc_ref': True, + }, True)
[arch-commits] Commit in python-recommonmark/trunk (2 files)
Date: Monday, September 11, 2017 @ 21:30:47 Author: anthraxx Revision: 257045 upgpkg: python-recommonmark 0.4.0.133.c410abb-3 (fix mdnode parent pos) Added: python-recommonmark/trunk/recommonmark-fix-mdnode-parent.patch Modified: python-recommonmark/trunk/PKGBUILD --+ PKGBUILD |9 ++--- recommonmark-fix-mdnode-parent.patch | 25 + 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-09-11 21:26:13 UTC (rev 257044) +++ PKGBUILD2017-09-11 21:30:47 UTC (rev 257045) @@ -3,7 +3,7 @@ pkgbase=python-recommonmark pkgname=('python-recommonmark' 'python2-recommonmark') pkgver=0.4.0.133.c410abb -pkgrel=2 +pkgrel=3 _gitcommit=c410abb565a3c4ad4de0ce204ab2fa2db8031cf1 pkgdesc='Markdown parser for docutils' url='https://github.com/rtfd/recommonmark' @@ -14,9 +14,11 @@ 'python2-setuptools' 'python2-commonmark' 'python2-docutils' 'python2-sphinx') checkdepends=('python-pytest' 'python2-pytest') source=(${pkgbase}::"git+https://github.com/rtfd/recommonmark#commit=$_gitcommit; -recommonmark-sphinx-refdomain-fix.patch) +recommonmark-sphinx-refdomain-fix.patch +recommonmark-fix-mdnode-parent.patch) sha512sums=('SKIP' - 'df2440e7ce927ca6adc31e07f9e375fa4643bbe1c33a34821d3d3e5d9d4b2ae8bbdf7412a8f2c64d343c9004f54a4a650fc59e461b3b1eb1ab11c1dec02422fd') + 'df2440e7ce927ca6adc31e07f9e375fa4643bbe1c33a34821d3d3e5d9d4b2ae8bbdf7412a8f2c64d343c9004f54a4a650fc59e461b3b1eb1ab11c1dec02422fd' + '89745108ad78349ace30582cb28f8693edc109c97e94182a37afe5219bec8988bb785d77594e34306facf0eaa4e640c0bdf4e53249d6154094222e58df9498e9') pkgver() { cd ${pkgbase} @@ -28,6 +30,7 @@ prepare() { 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 Added: recommonmark-fix-mdnode-parent.patch === --- recommonmark-fix-mdnode-parent.patch(rev 0) +++ recommonmark-fix-mdnode-parent.patch2017-09-11 21:30:47 UTC (rev 257045) @@ -0,0 +1,25 @@ +From c38a2fe8c0427d74edf94627d3bc4bf43306d385 Mon Sep 17 00:00:00 2001 +From: anthraxx+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 +