Fix travis matrix

andreynovikov · Apr 16, 2021 · 6260a28 · 6260a28
1 parent ded55a6
commit 6260a28
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,6 @@ matrix:
       - { python: "3.5", env: DJANGO_VERSION="2.0.*" }
       - { python: "3.5", env: DJANGO_VERSION="2.1.*" }
       - { python: "3.5", env: DJANGO_VERSION="2.2.*" }
-      - { python: "3.5", env: DJANGO_VERSION="3.1.*" }
-      - { python: "3.5", env: DJANGO_VERSION="3.2.*" }
 
       - { python: "3.6", env: DJANGO_VERSION="1.11.*" }
       - { python: "3.6", env: DJANGO_VERSION="2.0.*" }
@@ -22,15 +20,18 @@ matrix:
       - { python: "3.6", env: DJANGO_VERSION="3.1.*" }
       - { python: "3.6", env: DJANGO_VERSION="3.2.*" }
 
-      - { python: "3.7", env: DJANGO_VERSION="2.2.*", dist: xenial, sudo: true }
-      - { python: "3.7", env: DJANGO_VERSION="3.2.*", dist: xenial, sudo: true }
+      - { python: "3.7", env: DJANGO_VERSION="2.2.*" }
+      - { python: "3.7", env: DJANGO_VERSION="3.2.*" }
 
-      - { python: "3.8", env: DJANGO_VERSION="2.2.*", dist: xenial, sudo: true }
-      - { python: "3.8", env: DJANGO_VERSION="3.2.*", dist: xenial, sudo: true }
-      - { python: "3.8", env: DJANGO_VERSION="4.0.*", dist: xenial, sudo: true }
+      - { python: "3.8", env: DJANGO_VERSION="2.2.*" }
+      - { python: "3.8", env: DJANGO_VERSION="3.2.*" }
+      - { python: "3.8", env: DJANGO_VERSION=master }
 
-      - { python: "3.9", env: DJANGO_VERSION="3.2.*", dist: xenial, sudo: true }
-      - { python: "3.9", env: DJANGO_VERSION="4.0.*", dist: xenial, sudo: true }
+      - { python: "3.9", env: DJANGO_VERSION="3.2.*" }
+      - { python: "3.9", env: DJANGO_VERSION=master }
+
+    allow_failures:
+      - env: DJANGO_VERSION=master
 
 install:
     - pip install Django==${DJANGO_VERSION}

diff --git a/reviews/migrations/0001_initial.py b/reviews/migrations/0001_initial.py
@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11 on 2019-01-31 10:16
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion