Add Django 2.2 to allow failures

nephila · Aug 10, 2019 · 96e5913 · 96e5913
1 parent 8751279
commit 96e5913
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ env:
   - TOXENV='pep8'
   - TOXENV='isort'
   - TOXENV='docs'
+  - DJANGO='django22' CMS='cms37'
   - DJANGO='django21' CMS='cms37'
   - DJANGO='django21' CMS='cms36'
   - DJANGO='django21' CMS='cms35'
@@ -39,6 +40,8 @@ after_success:
 
 matrix:
   exclude:
+  - python: 2.7
+    env: DJANGO='django22' CMS='cms37'
   - python: 2.7
     env: DJANGO='django21' CMS='cms37'
   - python: 2.7
@@ -69,6 +72,13 @@ matrix:
     env: TOXENV='pep8'
   - python: 3.7
     env: TOXENV='isort'
+  allow_failures:
+    - python: 3.5
+      env: DJANGO='django22' CMS='cms37'
+    - python: 3.6
+      env: DJANGO='django22' CMS='cms37'
+    - python: 3.7
+      env: DJANGO='django22' CMS='cms37'
 
 
 cache: pip

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -12,6 +12,7 @@ History
 * Add support for Python 3.7
 * Add image size meta for Facebook
 * Add support for django-parler >= 2
+* Move to django-app-helper
 * Drop support for Django < 1.11
 * Drop support for django CMS < 3.5
 * Drop older compatibilities