Merge pull request #499 from joshuadavidthomas/python3.10

Add support for Python 3.10

.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:

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+

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

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

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',

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 =