Merge 0dfe7dc into 01f53e4

django-cms · Feb 22, 2021 · 79aa04f · 79aa04f
2 parents 01f53e4 + 0dfe7dc
commit 79aa04f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog
 =========
 
+Unreleased
+==========
+* Pinned django-treebeard to avoid breaking changes in django-treebeard 4.5
+
+* Enforce use of coverage > 4 for python 3.8 support
+* For testing python 2.7 and django 2.2 support enforced: django-sekizai >=0.7,<=1.10
+* For testing django 2.2 support enforced: django-app-helper<3.0.0 and sphinxcontrib-spelling<7.0.0
+* Enforced use of django-app-helper < 3.0.0
 
 3.7.4 (2020-07-21)
 ==================

diff --git a/setup.py b/setup.py
@@ -32,7 +32,7 @@
     'Django>=1.11,<4',
     'django-classy-tags>=0.7.2',
     'django-formtools>=2.1',
-    'django-treebeard>=4.3',
+    'django-treebeard>=4.3,<4.5',
     'django-sekizai>=0.7',
     'djangocms-admin-style>=1.2',
     'six',

diff --git a/test_requirements/requirements_base.txt b/test_requirements/requirements_base.txt
@@ -1,19 +1,19 @@
-coverage<5
-python-coveralls==2.5.0
+coverage>=4
+python-coveralls>2.5.0
 unittest-xml-reporting==1.11.0
 Pillow==5.2.0
-django-treebeard>=4.3
+django-treebeard>=4.3,<4.5
 argparse
 dj-database-url
 djangocms-admin-style>=1.5
-django-sekizai>=0.7
-django-classy-tags>=0.7.2
-https://github.com/divio/djangocms-text-ckeditor/archive/master.zip
+django-sekizai>=0.7,<=1.10
+django-classy-tags>=0.7.2,<2
+djangocms-text-ckeditor<4
 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
 sphinx==1.8.5
-sphinxcontrib-spelling
+sphinxcontrib-spelling<7.0.0 # restriction for py35 tests
 # required to run the server for integration tests
-django-app-helper
+django-app-helper<3.0.0
 mock>=2.0.0