Merge branch 'master' into m2m-support

johanneswilm · web-flow · commit 603c7e3484b9 · 2022-09-27T17:52:10.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,15 +12,15 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.7', '3.8', '3.9', '3.10']
-        django-version: ['3.2', '4.0', 'main']
+        django-version: ['3.2', '4.0', '4.1', 'main']
 
         exclude:
           - python-version: '3.7'
             django-version: '4.0'
+          - python-version: '3.7'
+            django-version: '4.1'
           - python-version: '3.7'
             django-version: 'main'
-          - python-version: '3.10'
-            django-version: '3.1'
 
     services:
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,13 +8,13 @@ repos:
           - "-x *test*.py"
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
         language_version: python3.8
 
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
       - id: flake8
         args:
@@ -26,7 +26,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: requirements-txt-fixer
         files: requirements/.*\.txt$
@@ -40,8 +40,14 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.27.1
     hooks:
       - id: yamllint
         args:
           - "--strict"
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.37.3
+    hooks:
+      - id: pyupgrade
+        args: [--py37-plus]
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -18,6 +18,7 @@ Authors
 - Amartis Gladius (`Amartis <https://github.com/amartis>`_)
 - Ben Lawson (`blawson <https://github.com/blawson>`_)
 - Benjamin Mampaey (`bmampaey <https://github.com/bmampaey>`_)
+- Bheesham Persaud (`bheesham <https://github.com/bheesham>`_)
 - `bradford281 <https://github.com/bradford281>`_
 - Brian Armstrong (`barm <https://github.com/barm>`_)
 - Brian Dixon
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,7 @@ Unreleased
 - Removed n+1 query from ``bulk_create_with_history`` utility (gh-975)
 - Started using ``exists`` query instead of ``count`` in ``populate_history`` command (gh-982)
 - Add basic support for many-to-many fields (gh-399)
+- Added support for Django 4.1 (gh-1021)
 
 3.1.1 (2022-04-23)
 ------------------
diff --git a/README.rst b/README.rst
@@ -43,6 +43,7 @@ This app supports the following combinations of Django and Python:
 ==========  ========================
 3.2         3.7, 3.8, 3.9, 3.10
 4.0         3.8, 3.9, 3.10
+4.1         3.8, 3.9, 3.10
 ==========  ========================
 
 Getting Help
diff --git a/docs/common_issues.rst b/docs/common_issues.rst
@@ -262,8 +262,6 @@ Using custom OneToOneFields
 If you are using a custom OneToOneField that has additional arguments and receiving
 the the following ``TypeError``::
 
-.. code=block:: python
-
     TypeError: __init__() got an unexpected keyword argument
 
 This is because Django Simple History coerces ``OneToOneField`` into ``ForeignKey``
diff --git a/docs/index.rst b/docs/index.rst
@@ -43,6 +43,7 @@ This app supports the following combinations of Django and Python:
 ==========  =======================
 3.2         3.7, 3.8, 3.9
 4.0         3.8, 3.9, 3.10
+4.1         3.8, 3.9, 3.10
 ==========  =======================
 
 Contribute
diff --git a/requirements/coverage.txt b/requirements/coverage.txt
@@ -1,2 +1,2 @@
-coverage==6.4.1
+coverage==6.4.4
 toml==0.10.2
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -1 +1 @@
-Sphinx==5.0.1
+Sphinx==5.1.1
diff --git a/requirements/lint.txt b/requirements/lint.txt
@@ -1,3 +1,3 @@
-black==22.3.0
-flake8==4.0.1
+black==22.6.0
+flake8==5.0.4
 isort==5.10.1
diff --git a/requirements/mysql.txt b/requirements/mysql.txt
@@ -1 +1 @@
-mysqlclient==2.1.0
+mysqlclient==2.1.1
diff --git a/requirements/tox.txt b/requirements/tox.txt
@@ -1,3 +1,3 @@
 -r ./coverage.txt
-tox==3.25.0
+tox==3.25.1
 tox-gh-actions==2.9.1
diff --git a/setup.py b/setup.py
@@ -32,6 +32,7 @@
             "Framework :: Django",
             "Framework :: Django :: 3.2",
             "Framework :: Django :: 4.0",
+            "Framework :: Django :: 4.1",
             "Programming Language :: Python",
             "Programming Language :: Python :: 3",
             "Programming Language :: Python :: 3.7",
diff --git a/simple_history/tests/tests/test_models.py b/simple_history/tests/tests/test_models.py
@@ -1327,14 +1327,8 @@ def test_migrations_include_order(self):
 
         model_state = state.ModelState.from_model(SeriesWork.history.model)
         found = False
-        # `fields` is a dict in Django 3.1
-        fields = None
-        if isinstance(model_state.fields, dict):
-            fields = model_state.fields.items()
-        else:
-            fields = model_state.fields
-
-        for name, field in fields:
+
+        for name, field in model_state.fields.items():
             if name == "_order":
                 found = True
                 self.assertEqual(type(field), models.IntegerField)
diff --git a/tox.ini b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py{37,38,39,310}-dj32-{sqlite3,postgres,mysql,mariadb},
-    py{38,39,310}-dj{40,main}-{sqlite3,postgres,mysql,mariadb},
+    py{38,39,310}-dj{40,41,main}-{sqlite3,postgres,mysql,mariadb},
     docs,
     lint
 
@@ -16,6 +16,7 @@ python =
 DJANGO =
     3.2: dj32
     4.0: dj40
+    4.1: dj41
     main: djmain
 
 [flake8]
@@ -29,6 +30,7 @@ deps =
     -rrequirements/test.txt
     dj32: Django>=3.2,<3.3
     dj40: Django>=4.0,<4.1
+    dj41: Django>=4.1,<4.2
     djmain: https://github.com/django/django/tarball/main
     postgres: -rrequirements/postgres.txt
     mysql: -rrequirements/mysql.txt

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-coverage==6.4.1`
	`1`	`+coverage==6.4.4`
`2`	`2`	`toml==0.10.2`