From c337c21a03fced96ff0693fdf5e36ef40b22c403 Mon Sep 17 00:00:00 2001 From: Fabio Caccamo Date: Mon, 12 Apr 2021 10:00:22 +0200 Subject: [PATCH] Added python 3.9 and django 3.2 to tox and travis. --- .travis.yml | 52 ++++++++++++++++++++++++++++++++++------------------ setup.py | 1 + tox.ini | 9 +++++---- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b6abcc..9091ee4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,6 +76,10 @@ jobs: env: TOX_ENV=py36-dj31-sqlite - python: "3.6" env: TOX_ENV=py36-dj31-postgres + - python: "3.6" + env: TOX_ENV=py36-dj32-sqlite + - python: "3.6" + env: TOX_ENV=py36-dj32-postgres - python: "3.6" env: TOX_ENV=py36-djmaster-sqlite - python: "3.6" @@ -100,6 +104,10 @@ jobs: env: TOX_ENV=py37-dj31-sqlite - python: "3.7" env: TOX_ENV=py37-dj31-postgres + - python: "3.7" + env: TOX_ENV=py37-dj32-sqlite + - python: "3.7" + env: TOX_ENV=py37-dj32-postgres - python: "3.7" env: TOX_ENV=py37-djmaster-sqlite - python: "3.7" @@ -116,26 +124,34 @@ jobs: env: TOX_ENV=py38-dj31-sqlite - python: "3.8" env: TOX_ENV=py38-dj31-postgres + - python: "3.8" + env: TOX_ENV=py38-dj32-sqlite + - python: "3.8" + env: TOX_ENV=py38-dj32-postgres - python: "3.8" env: TOX_ENV=py38-djmaster-sqlite - python: "3.8" env: TOX_ENV=py38-djmaster-postgres - # - python: "3.9" - # env: TOX_ENV=py39-dj22-sqlite - # - python: "3.9" - # env: TOX_ENV=py39-dj22-postgres - # - python: "3.9" - # env: TOX_ENV=py39-dj30-sqlite - # - python: "3.9" - # env: TOX_ENV=py39-dj30-postgres - # - python: "3.9" - # env: TOX_ENV=py39-dj31-sqlite - # - python: "3.9" - # env: TOX_ENV=py39-dj31-postgres - # - python: "3.9" - # env: TOX_ENV=py39-djmaster-sqlite - # - python: "3.9" - # env: TOX_ENV=py39-djmaster-postgres + - python: "3.9" + env: TOX_ENV=py39-dj22-sqlite + - python: "3.9" + env: TOX_ENV=py39-dj22-postgres + - python: "3.9" + env: TOX_ENV=py39-dj30-sqlite + - python: "3.9" + env: TOX_ENV=py39-dj30-postgres + - python: "3.9" + env: TOX_ENV=py39-dj31-sqlite + - python: "3.9" + env: TOX_ENV=py39-dj31-postgres + - python: "3.9" + env: TOX_ENV=py39-dj32-sqlite + - python: "3.9" + env: TOX_ENV=py39-dj32-postgres + - python: "3.9" + env: TOX_ENV=py39-djmaster-sqlite + - python: "3.9" + env: TOX_ENV=py39-djmaster-postgres allow_failures: - env: TOX_ENV=py36-djmaster-sqlite - env: TOX_ENV=py36-djmaster-postgres @@ -143,8 +159,8 @@ jobs: - env: TOX_ENV=py37-djmaster-postgres - env: TOX_ENV=py38-djmaster-sqlite - env: TOX_ENV=py38-djmaster-postgres - # - env: TOX_ENV=py39-djmaster-sqlite - # - env: TOX_ENV=py39-djmaster-postgres + - env: TOX_ENV=py39-djmaster-sqlite + - env: TOX_ENV=py39-djmaster-postgres install: - pip install tox services: diff --git a/setup.py b/setup.py index a4068f6..7d2f91d 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ setup( 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.0', 'Framework :: Django :: 3.1', + 'Framework :: Django :: 3.2', 'Intended Audience :: Developers', 'License :: OSI Approved :: MIT License', 'Natural Language :: English', diff --git a/tox.ini b/tox.ini index 9c3663f..9bd4384 100644 --- a/tox.ini +++ b/tox.ini @@ -2,10 +2,10 @@ envlist = py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres}, py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres}, - py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres}, - py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres}, - py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres}, - py39-{dj22,dj30,dj31,djmaster}-{sqlite,postgres}, + py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres}, + py37-{dj20,dj21,dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres}, + py38-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres}, + py39-{dj22,dj30,dj31,dj32,djmaster}-{sqlite,postgres}, [testenv] passenv = CI TRAVIS TRAVIS_* deps = @@ -19,6 +19,7 @@ deps = dj22: Django == 2.2.* dj30: Django == 3.0.* dj31: Django == 3.1.* + dj32: Django == 3.2.* djmaster: https://github.com/django/django/archive/master.tar.gz # mysql: mysqlclient postgres: psycopg2-binary