From d36ed0fd7bff825c8c5332d9eeb98efa916f3744 Mon Sep 17 00:00:00 2001 From: Andrzej Pragacz Date: Fri, 9 Apr 2021 09:52:33 +0200 Subject: [PATCH] Add django 3.2 and 3.1 to tox --- .circleci/config.yml | 23 +++++++++++++++++++++++ tox.ini | 2 ++ 2 files changed, 25 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index da18cf6..e7cd6fc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,13 @@ executors: username: $DOCKERHUB_USERNAME password: $DOCKERHUB_PASSWORD working_directory: ~/project + docker-executor-py39: + docker: + - image: cimg/python:3.9 + auth: + username: $DOCKERHUB_USERNAME + password: $DOCKERHUB_PASSWORD + working_directory: ~/project commands: save_pip_cache: @@ -163,21 +170,37 @@ workflows: - mypy - setup_project - test-tox: + name: test-tox-py39-django32 + py: "39" + django: "32" + requires: + - test + - test-tox: + name: test-tox-py38-django31 + py: "38" + django: "31" + requires: + - test + - test-tox: + name: test-tox-py37-django30 py: "37" django: "30" requires: - test - test-tox: + name: test-tox-py37-django22 py: "37" django: "22" requires: - test - test-tox: + name: test-tox-py36-django21 py: "36" django: "21" requires: - test - test-tox: + name: test-tox-py36-django20 py: "36" django: "20" requires: diff --git a/tox.ini b/tox.ini index a34620f..bdda99a 100644 --- a/tox.ini +++ b/tox.ini @@ -25,6 +25,8 @@ deps = django21: Django>=2.1,<2.2 django22: Django>=2.2,<2.3 django30: Django>=3.0,<3.1 + django31: Django>=3.1,<3.2 + django32: Django>=3.2,<3.3 djangomaster: https://github.com/django/django/archive/master.tar.gz py{35,36}-django{111,20,21,22}: djangorestframework>=3.11,<3.12 -rrequirements/requirements-testing-base.txt