Fixed djangocms-text-ckeditor version for older Django versions (#6651)…

… (#6654)
django-cms · Mar 20, 2019 · 4ced5f9 · 4ced5f9
1 parent 39ddf60
commit 4ced5f9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -66,7 +66,7 @@ before_script:
 
 before_install:
   - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
-  - pip install -U pip>=8.0
+  - pip install -U "pip>=8.0,<18.0"
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip saucelabs\]'; export USE_SAUCE_LABS=$?; true
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[ci only docs\]'; export ONLY_DOCS=$?; true
 

diff --git a/test_requirements/django-1.10.txt b/test_requirements/django-1.10.txt
@@ -3,3 +3,4 @@ Django>=1.10,<1.11
 django-reversion==1.10,<1.11
 https://github.com/KristianOellegaard/django-hvad/archive/master.zip
 django-formtools
+djangocms-text-ckeditor<=3.6.1
diff --git a/test_requirements/django-1.11.txt b/test_requirements/django-1.11.txt
@@ -3,3 +3,4 @@ Django>=1.11,<2.0
 django-reversion>=2.0
 https://github.com/KristianOellegaard/django-hvad/archive/master.zip
 django-formtools
+djangocms-text-ckeditor
diff --git a/test_requirements/django-1.8.txt b/test_requirements/django-1.8.txt
@@ -2,3 +2,4 @@
 Django>=1.8,<1.9
 django-hvad==1.5
 django-formtools
+djangocms-text-ckeditor<=3.6.1
diff --git a/test_requirements/django-1.9.txt b/test_requirements/django-1.9.txt
@@ -2,3 +2,4 @@
 Django>=1.9,<1.10
 django-hvad==1.5
 django-formtools
+djangocms-text-ckeditor<=3.6.1
diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
@@ -8,7 +8,6 @@ dj-database-url
 djangocms-admin-style>=1.0
 django-sekizai>=0.9
 django-classy-tags>=0.7.2
-https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
 https://github.com/ojii/django-better-test/archive/8aa2407d097fe3789b74682f0e6bd7d15d449416.zip#egg=django-better-test
 https://github.com/ojii/django-app-manage/archive/65da18ef234a4e985710c2c0ec760023695b40fe.zip#egg=django-app-manage
 iptools