Skip to content

Commit 0721460

Browse files
authored
Merge pull request #36735 from wgu-ram-chandra/issue-35271-unpin-markdown
chore: update markdown dependency to allow newer versions
2 parents 6a67719 + 6c29b79 commit 0721460

7 files changed

Lines changed: 8 additions & 18 deletions

File tree

lms/djangoapps/course_wiki/plugins/markdownedx/mdx_mathjax.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ def handleMatch(self, m):
2121

2222

2323
class MathJaxExtension(markdown.Extension):
24-
def extendMarkdown(self, md, md_globals): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
24+
def extendMarkdown(self, md): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
2525
# Needs to come before escape matching because \ is pretty important in LaTeX
26-
md.inlinePatterns.add('mathjax', MathJaxPattern(), '<escape')
26+
md.inlinePatterns.register(MathJaxPattern(), 'mathjax', 180)
2727

2828

2929
def makeExtension(**kwargs):

lms/djangoapps/course_wiki/plugins/markdownedx/mdx_video.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ def add_inline(self, md, name, klass, re): # pylint: disable=invalid-name
164164
pattern = klass(re)
165165
pattern.md = md
166166
pattern.ext = self
167-
md.inlinePatterns.add(name, pattern, "<reference")
167+
md.inlinePatterns.register(pattern, name, 170)
168168

169-
def extendMarkdown(self, md, md_globals): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
169+
def extendMarkdown(self, md): # lint-amnesty, pylint: disable=arguments-differ, unused-argument
170170
self.add_inline(md, 'bliptv', Bliptv,
171171
r'([^(]|^)http://(\w+\.|)blip.tv/file/get/(?P<bliptvfile>\S+.flv)')
172172
self.add_inline(md, 'dailymotion', Dailymotion,

requirements/constraints.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ edx-enterprise==6.0.2
6464
# https://github.com/openedx/edx-platform/issues/31616
6565
libsass==0.10.0
6666

67-
# Date: 2018-12-14
68-
# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
69-
# pinning the version untill the issue gets resolved in the package itself
70-
# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35271
71-
markdown<3.4.0
72-
7367
# Date: 2024-07-16
7468
# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
7569
# Otherwise we see a failure while running the following command:

requirements/edx/base.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,8 @@ mako==1.3.10
719719
# lti-consumer-xblock
720720
# xblock
721721
# xblock-utils
722-
markdown==3.3.7
722+
markdown==3.8
723723
# via
724-
# -c requirements/edx/../constraints.txt
725724
# -r requirements/edx/kernel.in
726725
# openedx-django-wiki
727726
# staff-graded-xblock

requirements/edx/development.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,9 +1211,8 @@ mako==1.3.10
12111211
# lti-consumer-xblock
12121212
# xblock
12131213
# xblock-utils
1214-
markdown==3.3.7
1214+
markdown==3.8
12151215
# via
1216-
# -c requirements/edx/../constraints.txt
12171216
# -r requirements/edx/doc.txt
12181217
# -r requirements/edx/testing.txt
12191218
# openedx-django-wiki

requirements/edx/doc.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,9 +869,8 @@ mako==1.3.10
869869
# lti-consumer-xblock
870870
# xblock
871871
# xblock-utils
872-
markdown==3.3.7
872+
markdown==3.8
873873
# via
874-
# -c requirements/edx/../constraints.txt
875874
# -r requirements/edx/base.txt
876875
# openedx-django-wiki
877876
# staff-graded-xblock

requirements/edx/testing.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -925,9 +925,8 @@ mako==1.3.10
925925
# lti-consumer-xblock
926926
# xblock
927927
# xblock-utils
928-
markdown==3.3.7
928+
markdown==3.8
929929
# via
930-
# -c requirements/edx/../constraints.txt
931930
# -r requirements/edx/base.txt
932931
# openedx-django-wiki
933932
# staff-graded-xblock

0 commit comments

Comments
 (0)