From a48d2175ba88a9510bd1c636aa573ba523b0addc Mon Sep 17 00:00:00 2001 From: Fabio Caccamo Date: Wed, 6 Feb 2019 17:00:45 +0100 Subject: [PATCH] Removed django 2.2 from tox and travis. --- .travis.yml | 13 ------------- tox.ini | 7 +++---- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index aeb5d9f..0a84fd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,6 @@ env: - TOX_ENV=py35-dj20-postgres - TOX_ENV=py35-dj21-sqlite - TOX_ENV=py35-dj21-postgres - - TOX_ENV=py35-dj22-sqlite - - TOX_ENV=py35-dj22-postgres matrix: include: - python: "3.6" @@ -51,10 +49,6 @@ matrix: env: - TOX_ENV=py36-dj21-sqlite - TOX_ENV=py36-dj21-postgres - - python: "3.6" - env: - - TOX_ENV=py36-dj22-sqlite - - TOX_ENV=py36-dj22-postgres - python: "3.6" env: - TOX_ENV=py36-djmaster-sqlite @@ -73,13 +67,6 @@ matrix: dist: xenial language: python sudo: required - - python: "3.7" - env: - - TOX_ENV=py37-dj22-sqlite - - TOX_ENV=py37-dj22-postgres - dist: xenial - language: python - sudo: required - python: "3.7" env: - TOX_ENV=py37-djmaster-sqlite diff --git a/tox.ini b/tox.ini index 6a8a8f7..7b8d86d 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,9 @@ envlist = py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres}, py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres}, - py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres}, - py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,djmaster}-{sqlite,postgres}, - py37-{dj20,dj21,dj22,djmaster}-{sqlite,postgres}, + py35-{dj18,dj19,dj110,dj111,dj20,dj21}-{sqlite,postgres}, + py36-{dj18,dj19,dj110,dj111,dj20,dj21,djmaster}-{sqlite,postgres}, + py37-{dj20,dj21,djmaster}-{sqlite,postgres}, [testenv] passenv = CI TRAVIS TRAVIS_* deps = @@ -15,7 +15,6 @@ deps = dj111: Django >= 1.11, < 1.12 dj20: Django >= 2.0, < 2.1 dj21: Django >= 2.1, < 2.2 - dj22: Django >= 2.2, < 2.3 djmaster: https://github.com/django/django/archive/master.tar.gz # mysql: mysqlclient postgres: psycopg2-binary