Skip to content

Commit fa9d516

Browse files
authored
Update docstring test for more recent pygments version (#8530)
* Update docstring test for more recent pygments version * Drop unused import
1 parent 2506d0b commit fa9d516

File tree

2 files changed

+6
-30
lines changed

2 files changed

+6
-30
lines changed

requirements/requirements-optionals.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ coreapi==2.3.1
33
coreschema==0.0.4
44
django-filter>=2.4.0,<3.0
55
django-guardian>=2.4.0,<2.5
6-
markdown==3.3;python_version>="3.6"
7-
markdown==3.2.2;python_version=="3.5"
6+
markdown==3.3
87
psycopg2-binary>=2.8.5,<2.9
9-
pygments>=2.7.1,<2.8
8+
pygments==2.12
109
pyyaml>=5.3.1,<5.4

tests/test_description.py

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import sys
2-
31
import pytest
42
from django.test import TestCase
53

@@ -33,7 +31,7 @@
3331

3432
# If markdown is installed we also test it's working
3533
# (and that our wrapped forces '=' to h2 and '-' to h3)
36-
MARKDOWN_BASE = """<h2 id="an-example-docstring">an example docstring</h2>
34+
MARKDOWN_DOCSTRING = """<h2 id="an-example-docstring">an example docstring</h2>
3735
<ul>
3836
<li>list</li>
3937
<li>list</li>
@@ -42,25 +40,8 @@
4240
<pre><code>code block
4341
</code></pre>
4442
<p>indented</p>
45-
<h2 id="hash-style-header">hash style header</h2>%s"""
46-
47-
MARKDOWN_gte_33 = """
48-
<div class="highlight"><pre><span></span><span class="p">[{</span><br />\
49-
<span class="nt">&quot;alpha&quot;</span><span class="p">:</span>\
50-
<span class="mi">1</span><span class="p">,</span><br />\
51-
<span class="nt">&quot;beta&quot;</span><span class="p">:</span>\
52-
<span class="s2">&quot;this is a string&quot;</span><br />\
53-
<span class="p">}]</span><br /></pre></div>
54-
<p><br /></p>"""
55-
56-
MARKDOWN_lt_33 = """
57-
<div class="highlight"><pre><span></span><span class="p">[{</span><br />\
58-
<span class="nt">&quot;alpha&quot;</span><span class="p">:</span>\
59-
<span class="mi">1</span><span class="p">,</span><br />\
60-
<span class="nt">&quot;beta&quot;</span><span class="p">:</span>\
61-
<span class="s2">&quot;this is a string&quot;</span><br />\
62-
<span class="p">}]</span><br /></pre></div>
63-
43+
<h2 id="hash-style-header">hash style header</h2>
44+
<div class="highlight"><pre><span></span><span class="p">[{</span><span class="w"></span><br /><span class="w"> </span><span class="nt">&quot;alpha&quot;</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="nt">&quot;beta&quot;</span><span class="p">:</span><span class="w"> </span><span class="s2">&quot;this is a string&quot;</span><span class="w"></span><br /><span class="p">}]</span><span class="w"></span><br /></pre></div>
6445
<p><br /></p>"""
6546

6647

@@ -163,11 +144,7 @@ def test_markdown(self):
163144
"""
164145
Ensure markdown to HTML works as expected.
165146
"""
166-
# Markdown 3.3 is only supported on Python 3.6 and higher
167-
if sys.version_info >= (3, 6):
168-
assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_gte_33
169-
else:
170-
assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_lt_33
147+
assert apply_markdown(DESCRIPTION) == MARKDOWN_DOCSTRING
171148

172149

173150
def test_dedent_tabs():

0 commit comments

Comments
 (0)