From 6260a283ed78702fe7a667236573c58a77ca9dc1 Mon Sep 17 00:00:00 2001 From: Andrey Novikov Date: Fri, 16 Apr 2021 12:52:21 +0300 Subject: [PATCH] Fix travis matrix --- .travis.yml | 19 ++++++++++--------- reviews/migrations/0001_initial.py | 3 --- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index e53777a..81e47cd 100644 --- 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 index 4897e31..e99167c 100644 --- 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