Source: djangorestframework Version: 3.12.4-2 Followup-For: Bug #1005779 Dear maintainer,
I prepared an NMU to fix this issue, as it's blocking the migration of pygments to testing. I uploaded to DELAYED/5. Please cancel it or tell me to cancel it if you'd rather fix the issue yourself. Paul
diff --git a/debian/changelog b/debian/changelog index 4c6bd9e..b2cd026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +djangorestframework (3.12.4-2.1) unstable; urgency=medium + + * Non-maintainer upload + * tests: update for newer pygments (Closes: #1005779) + + -- Paul Gevers <elb...@debian.org> Sun, 13 Mar 2022 19:19:52 +0100 + djangorestframework (3.12.4-2) unstable; urgency=medium * debian/rules diff --git a/debian/patches/series b/debian/patches/series index 67355cd..0a97bd1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0002-Clean-all-privacy-breaches-in-the-package.patch 0002-Fix-asset-names-to-match-symlinks-to-packaged-files.patch 0003-Fix-tests-with-mock-timezone-7911.patch +tests-update-for-newer-pygments.patch diff --git a/debian/patches/tests-update-for-newer-pygments.patch b/debian/patches/tests-update-for-newer-pygments.patch new file mode 100644 index 0000000..b55900e --- /dev/null +++ b/debian/patches/tests-update-for-newer-pygments.patch @@ -0,0 +1,38 @@ +From: Paul Gevers <elb...@debian.org> +Date: Sun, 13 Mar 2022 17:12:30 +0100 +X-Dgit-Generated: 3.12.4-2.1 3e10ec7e98630c1f46952ca1d9b26237187c6c52 +Subject: tests: update for newer pygments + +Closes: #1005779 + +--- + +--- djangorestframework-3.12.4.orig/tests/test_description.py ++++ djangorestframework-3.12.4/tests/test_description.py +@@ -45,12 +45,20 @@ MARKDOWN_BASE = """<h2 id="an-example-do + <h2 id="hash-style-header">hash style header</h2>%s""" + + MARKDOWN_gte_33 = """ +-<div class="highlight"><pre><span></span><span class="p">[{</span><br />\ +- <span class="nt">"alpha"</span><span class="p">:</span>\ +- <span class="mi">1</span><span class="p">,</span><br />\ +- <span class="nt">"beta: "</span><span class="err">this\ +-</span> <span class="err">is</span> <span class="err">a</span> \ +-<span class="err">string"</span><br /><span class="p">}]</span>\ ++<div class="highlight"><pre><span></span><span class="p">[{</span>\ ++<span class="w"></span><br /><span class="w"> </span>\ ++<span class="nt">"alpha"</span><span class="p">:</span>\ ++<span class="w"> </span>\ ++<span class="mi">1</span><span class="p">,</span>\ ++<span class="w"></span><br /><span class="w"> </span>\ ++<span class="s2">"beta: "</span>\ ++<span class="kc">t</span><span class="err">his</span>\ ++<span class="w"> </span><span class="err">is</span>\ ++<span class="w"> </span><span class="err">a</span>\ ++<span class="w"> </span>\ ++<span class="err">s</span><span class="kc">tr</span><span class="err">i</span>\ ++<span class="kc">n</span><span class="err">g"</span>\ ++<br /><span class="err">}]</span>\ + <br /></pre></div> + <p><br /></p>""" +