Merge pull request #553 from felixxm/django-version

Bumped Django 1.11 version. Moved Django 1.11 to allowed_failures in the travis configuration.
django-mptt · Mar 27, 2017 · f7650c6 · f7650c6
2 parents 07cd45e + 2f8a58c
commit f7650c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,13 +23,14 @@ matrix:
       python: "3.3"
     - env: DJANGO="Django>=1.10,<1.11"
       python: "3.3"
-    - env: DJANGO="Django>=1.11b1,<2.0"
+    - env: DJANGO="Django>=1.11rc1,<2.0"
       python: "3.3"
     - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
       python: "2.7"
     - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
       python: "3.3"
   allow_failures:
+    - env: DJANGO="Django>=1.11rc1,<2.0"
     - env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
 
 before_install: pip install --upgrade pip

diff --git a/tox.ini b/tox.ini
@@ -17,4 +17,4 @@ deps =
     dj18: Django>=1.8,<1.9
     dj19: Django>=1.9,<1.10
     dj110: Django>=1.10,<1.11
-    dj111: Django>=1.11b1,<2.0
+    dj111: Django>=1.11rc1,<2.0