From fa9d516ee24b2447a351af92e139d386b4f0d2b4 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Mon, 20 Jun 2022 10:44:27 +0100
Subject: [PATCH] Update docstring test for more recent pygments version
 (#8530)

* Update docstring test for more recent pygments version

* Drop unused import
---
 requirements/requirements-optionals.txt |  5 ++--
 tests/test_description.py               | 31 ++++---------------------
 2 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt
index 75b9ab4d6..f3bb9b709 100644
--- a/requirements/requirements-optionals.txt
+++ b/requirements/requirements-optionals.txt
@@ -3,8 +3,7 @@ coreapi==2.3.1
 coreschema==0.0.4
 django-filter>=2.4.0,<3.0
 django-guardian>=2.4.0,<2.5
-markdown==3.3;python_version>="3.6"
-markdown==3.2.2;python_version=="3.5"
+markdown==3.3
 psycopg2-binary>=2.8.5,<2.9
-pygments>=2.7.1,<2.8
+pygments==2.12
 pyyaml>=5.3.1,<5.4
diff --git a/tests/test_description.py b/tests/test_description.py
index 363ad6513..ecc6b9776 100644
--- a/tests/test_description.py
+++ b/tests/test_description.py
@@ -1,5 +1,3 @@
-import sys
-
 import pytest
 from django.test import TestCase
 
@@ -33,7 +31,7 @@ indented
 
 # If markdown is installed we also test it's working
 # (and that our wrapped forces '=' to h2 and '-' to h3)
-MARKDOWN_BASE = """<h2 id="an-example-docstring">an example docstring</h2>
+MARKDOWN_DOCSTRING = """<h2 id="an-example-docstring">an example docstring</h2>
 <ul>
 <li>list</li>
 <li>list</li>
@@ -42,25 +40,8 @@ MARKDOWN_BASE = """<h2 id="an-example-docstring">an example docstring</h2>
 <pre><code>code block
 </code></pre>
 <p>indented</p>
-<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">&quot;alpha&quot;</span><span class="p">:</span>\
- <span class="mi">1</span><span class="p">,</span><br />\
-    <span class="nt">&quot;beta&quot;</span><span class="p">:</span>\
- <span class="s2">&quot;this is a string&quot;</span><br />\
-<span class="p">}]</span><br /></pre></div>
-<p><br /></p>"""
-
-MARKDOWN_lt_33 = """
-<div class="highlight"><pre><span></span><span class="p">[{</span><br />\
-    <span class="nt">&quot;alpha&quot;</span><span class="p">:</span>\
- <span class="mi">1</span><span class="p">,</span><br />\
-    <span class="nt">&quot;beta&quot;</span><span class="p">:</span>\
- <span class="s2">&quot;this is a string&quot;</span><br />\
-<span class="p">}]</span><br /></pre></div>
-
+<h2 id="hash-style-header">hash style header</h2>
+<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>
 <p><br /></p>"""
 
 
@@ -163,11 +144,7 @@ class TestViewNamesAndDescriptions(TestCase):
         """
         Ensure markdown to HTML works as expected.
         """
-        # Markdown 3.3 is only supported on Python 3.6 and higher
-        if sys.version_info >= (3, 6):
-            assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_gte_33
-        else:
-            assert apply_markdown(DESCRIPTION) == MARKDOWN_BASE % MARKDOWN_lt_33
+        assert apply_markdown(DESCRIPTION) == MARKDOWN_DOCSTRING
 
 
 def test_dedent_tabs():