diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac6d847..7d08edc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,7 @@ jobs: fail-fast: false max-parallel: 5 matrix: - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.6', '3.7', '3.8', '3.9', '3.10'] services: postgres: diff --git a/CHANGES.rst b/CHANGES.rst index 34f7028..58b7410 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Unreleased ---------- - Add support for `Django 3.2` - Drop support for `Django 3.0` - +- Add support for `Python 3.10` - Added urlsafe token field. - Introduce context manager for FieldTracker state reset (GH-#491) - Fix performance regression of FieldTracker on FileField subclasses on Django 3.1+ diff --git a/model_utils/fields.py b/model_utils/fields.py index 7cf0a73..ce05e9f 100644 --- a/model_utils/fields.py +++ b/model_utils/fields.py @@ -1,6 +1,6 @@ import secrets import uuid -from collections import Callable +from collections.abc import Callable from django.conf import settings from django.core.exceptions import ValidationError diff --git a/requirements-test.txt b/requirements-test.txt index f442121..62ed4cc 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,4 @@ -pytest==6.0.2 +pytest==6.2.5 pytest-django==3.10.0 psycopg2-binary==2.8.6 pytest-cov==2.10.1 diff --git a/setup.py b/setup.py index 85dadd5..15cc212 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup( 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'Framework :: Django', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.1', diff --git a/tox.ini b/tox.ini index 204abe3..6f7c855 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] envlist = py{36,37,38,39}-dj{22,31,32} - py{38,39}-djmain + py310-dj{31,32} + py{38,39,310}-djmain flake8 isort @@ -11,6 +12,7 @@ python = 3.7: py37 3.8: py38, flake8, isort 3.9: py39 + 3.10: py310 [testenv] deps =