Merge branch 'hotfix/1.6.1'

Princeton-CDH · May 8, 2024 · 646962d · 646962d
2 parents 8403063 + 96bbf35
commit 646962d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+1.6.1
+-----
+
+* Pin django-markdownify to 0.9.3 to avoid an incompatibility error with bleach in django-markdownify 0.9.4
+
 1.6
 ---
 

diff --git a/mep/__init__.py b/mep/__init__.py
@@ -1,4 +1,4 @@
-__version_info__ = (1, 6, 0, None)
+__version_info__ = (1, 6, 1, None)
 
 
 # Dot-connect all but the last. Last is dash-connected if not None.

diff --git a/requirements.txt b/requirements.txt
@@ -24,7 +24,8 @@ bleach
 django-fullurl
 unidecode
 stop_words
-django-markdownify>=0.9
+# as of 2024-05-08 django-markdownify==0.9.4 causes an error with bleach
+django-markdownify==0.9.3
 tweepy
 # specify bs4 version to avoid wagtail version conflict
 beautifulsoup4<4.9