Skip to content

Commit

Permalink
Merge pull request #1180 from django-wiki/dependabot/pip/markdown-gte…
Browse files Browse the repository at this point in the history
…-3.1-and-lt-3.4

Update markdown requirement from <3.3,>=3.1 to >=3.1,<3.4
  • Loading branch information
benjaoming committed May 7, 2022
2 parents bbbc33b + d254bc8 commit 2fc998e
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 4 deletions.
11 changes: 11 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ Release plan
- **0.7.x** Removes Django 2.1 support, adds Django 3.1, 3.2


0.8.2
-----

Unreleased

Changed
~~~~~~~

* Python-Markdown updated to 3.3 :url-issue:`1180` (Benjamin Balder Bach)


0.8.1
-----

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get_path(fname):
"django-mptt>=0.13,<0.14",
"django-sekizai>=0.10",
"sorl-thumbnail>=12.8,<13",
"Markdown>=3.1,<3.3",
"Markdown>=3.3,<3.4",
]

test_requirements = [
Expand Down
2 changes: 1 addition & 1 deletion src/wiki/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@

default_app_config = "wiki.apps.WikiConfig"

VERSION = (0, 8, 1, "final", 0)
VERSION = (0, 8, 2, "alpha", 0)
__version__ = get_version(VERSION)
4 changes: 2 additions & 2 deletions tests/core/test_markdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def test_fenced_code(self):
else (
"""<p>Code:</p>\n"""
"""<div class="codehilite-wrap"><pre class="codehilite"><code class="language-python">echo 'line 1'\n"""
"""echo 'line 2'</code></pre>\n"""
"""echo 'line 2'\n</code></pre>\n"""
"""</div>"""
)
)
Expand Down Expand Up @@ -106,7 +106,7 @@ def test_indented_code(self):
"""<div class="codehilite-wrap"><pre class="codehilite"><code class="language-python linenums">#!/usr/bin/python\n"""
"""print('line 1')\n"""
"""print('line 2')\n"""
"""print('æøå')</code></pre>\n"""
"""print('æøå')\n</code></pre>\n"""
"""</div>"""
)
)
Expand Down

0 comments on commit 2fc998e

Please sign in to comment.