summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Cazenave <ecazenave@entrouvert.com>2019-05-20 09:04:57 (GMT)
committerEmmanuel Cazenave <ecazenave@entrouvert.com>2019-05-20 14:31:12 (GMT)
commit07562beebd2769ea5f91756bb75522bef6869631 (patch)
treeb501a8bd03f4ce542199a248c8ff4c134a3a8388
parent2ab28842afefc50c884e81c4498db78d2237cd3c (diff)
downloadcombo-07562beebd2769ea5f91756bb75522bef6869631.zip
combo-07562beebd2769ea5f91756bb75522bef6869631.tar.gz
combo-07562beebd2769ea5f91756bb75522bef6869631.tar.bz2
bump django-ckeditor version compatibility (#33250)
-rw-r--r--requirements.txt2
-rw-r--r--setup.py2
-rw-r--r--tox.ini1
3 files changed, 3 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index 9b147af..c4eca6a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
Django>=1.8, <1.12
-django-ckeditor<4.5.3
+-e git+http://git.entrouvert.org/debian/django-ckeditor.git#egg=django_ckeditor
gadjo
feedparser
django-jsonfield
diff --git a/setup.py b/setup.py
index 1121357..1a577c4 100644
--- a/setup.py
+++ b/setup.py
@@ -147,7 +147,7 @@ setup(
'Programming Language :: Python :: 3',
],
install_requires=['django>=1.8, <1.12',
- 'django-ckeditor<4.5.3',
+ 'django-ckeditor<=4.5.3',
'gadjo>=0.53',
'feedparser',
'django-jsonfield',
diff --git a/tox.ini b/tox.ini
index 1ce3287..eb2de1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,7 @@ deps =
django-mellon
py2: quixote<3.0
py2: vobject
+ git+http://git.entrouvert.org/debian/django-ckeditor.git
commands =
./getlasso.sh
python manage.py compilemessages