You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2022/02/11 17:36:47 UTC

[allura] 10/12: [#8408] upgrade to markdown 3.3

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit fc828c034c7440afd1ddc4465acc0c4f3804d2cc
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Tue Jan 18 17:11:03 2022 -0500

    [#8408] upgrade to markdown 3.3
---
 Allura/allura/tests/test_globals.py | 4 +---
 Allura/allura/tests/test_helpers.py | 2 +-
 requirements.txt                    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 019e406..fa9572f 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -177,7 +177,7 @@ def test_macro_gittip_button():
     assert_equal(
         r,
         '<div class="markdown_content"><p><iframe height="22pt" src="https://www.gittip.com/test/widget.html" '
-        'style="border: 0; margin: 0; padding: 0;" width="48pt"></iframe></p>\n</div>')
+        'style="border: 0; margin: 0; padding: 0;" width="48pt"></iframe></p></div>')
 
 
 def test_macro_neighborhood_feeds():
@@ -486,7 +486,6 @@ Some text in a regular paragraph
         '<div class="codehilite"><pre><span></span><code><span class="k">for</span> <span class="n">i</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="mi">10</span><span class="p">):</span>\n'
         '    <span class="nb">print</span> <span class="n">i</span>\n'
         '</code></pre></div>\n'
-        '\n'
         '</div>'
     )
     assert_equal(
@@ -501,7 +500,6 @@ def foo(): pass
 ~~~~'''),
         '<div class="markdown_content"><div class="codehilite"><pre><span></span><code>def foo(): pass\n'
         '</code></pre></div>\n'
-        '\n'
         '</div>'
     )
 
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 5250db8..71f33cb 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -275,7 +275,7 @@ def test_render_any_markup_formatting():
                   '<div class="markdown_content"><h3 id="foo">foo</h3>\n'
                   '<div class="codehilite"><pre><span></span><code><span class="nt">'
                   '&lt;script&gt;</span>alert(1)<span class="nt">'
-                  '&lt;/script&gt;</span> bar\n</code></pre></div>\n\n</div>')
+                  '&lt;/script&gt;</span> bar\n</code></pre></div>\n</div>')
 
 
 def test_render_any_markdown_encoding():
diff --git a/requirements.txt b/requirements.txt
index a2d4c66..8c41d65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -75,7 +75,7 @@ iso8601==0.1.16
     # via colander
 jinja2==3.0.2
     # via -r requirements.in
-markdown==3.2.2
+markdown==3.3.6
     # via
     #   -r requirements.in
     #   markdown-checklist