From 50294a213bb4083e5a9833c5e9f4d7c41ec79fc2 Mon Sep 17 00:00:00 2001
From: David-Wobrock <david.wobrock@gmail.com>
Date: Sat, 10 Oct 2020 17:56:35 +0200
Subject: [PATCH] Add Dj3.1 support and update flake8 and black versions

---
 .travis.yml                                                | 6 ++++++
 CHANGELOG.md                                               | 5 +++++
 .../management/commands/makemigrations.py                  | 4 +++-
 django_migration_linter/management/utils.py                | 4 +++-
 setup.py                                                   | 1 +
 tests/functional/test_data_migrations.py                   | 3 ++-
 tox.ini                                                    | 7 ++++---
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1f464a7..a00ef82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,8 @@ jobs:
       env: TOXENV=py36-django22
     - python: 3.6
       env: TOXENV=py36-django30
+    - python: 3.6
+      env: TOXENV=py36-django31
 
     - python: 3.7
       env: TOXENV=py37-django111
@@ -43,6 +45,8 @@ jobs:
       env: TOXENV=py37-django22
     - python: 3.7
       env: TOXENV=py37-django30
+    - python: 3.7
+      env: TOXENV=py37-django31
 
     - python: 3.8
       env: TOXENV=py38-django111
@@ -54,6 +58,8 @@ jobs:
       env: TOXENV=py38-django22
     - python: 3.8
       env: TOXENV=py38-django30
+    - python: 3.8
+      env: TOXENV=py38-django31
 
     - python: 3.6
       env: TOXENV=lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 426e092..76ddaba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 2.4.1
+
+* Add Django 3.1 support
+* Upgrade linter versions of `flake8` and `black` to the latest
+
 ## 2.4.0
 
 * Add possibility to lint newly generated migrations through the `makemigrations` command.
diff --git a/django_migration_linter/management/commands/makemigrations.py b/django_migration_linter/management/commands/makemigrations.py
index 6336b2f..a3d329b 100644
--- a/django_migration_linter/management/commands/makemigrations.py
+++ b/django_migration_linter/management/commands/makemigrations.py
@@ -31,7 +31,9 @@ class Command(MakeMigrationsCommand):
     def add_arguments(self, parser):
         super(Command, self).add_arguments(parser)
         parser.add_argument(
-            "--lint", action="store_true", help="Lint newly generated migrations.",
+            "--lint",
+            action="store_true",
+            help="Lint newly generated migrations.",
         )
         register_linting_configuration_options(parser)
 
diff --git a/django_migration_linter/management/utils.py b/django_migration_linter/management/utils.py
index 14ae4c1..838ff67 100644
--- a/django_migration_linter/management/utils.py
+++ b/django_migration_linter/management/utils.py
@@ -17,5 +17,7 @@ def register_linting_configuration_options(parser):
     )
 
     parser.add_argument(
-        "--warnings-as-errors", action="store_true", help="handle warnings as errors",
+        "--warnings-as-errors",
+        action="store_true",
+        help="handle warnings as errors",
     )
diff --git a/setup.py b/setup.py
index 36083b9..8202e6c 100644
--- a/setup.py
+++ b/setup.py
@@ -58,6 +58,7 @@ setup(
         "Framework :: Django :: 2.1",
         "Framework :: Django :: 2.2",
         "Framework :: Django :: 3.0",
+        "Framework :: Django :: 3.1",
         "Programming Language :: Python",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
diff --git a/tests/functional/test_data_migrations.py b/tests/functional/test_data_migrations.py
index c1d5485..2405091 100644
--- a/tests/functional/test_data_migrations.py
+++ b/tests/functional/test_data_migrations.py
@@ -11,7 +11,8 @@ class DataMigrationDetectionTestCase(unittest.TestCase):
     def setUp(self, *args, **kwargs):
         self.test_project_path = os.path.dirname(settings.BASE_DIR)
         self.linter = MigrationLinter(
-            self.test_project_path, include_apps=fixtures.DATA_MIGRATIONS,
+            self.test_project_path,
+            include_apps=fixtures.DATA_MIGRATIONS,
         )
 
     def test_reverse_data_migration(self):
diff --git a/tox.ini b/tox.ini
index 2fca695..87bcbad 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
     py27-django111
     py{35,36,37,38}-django{111,20,21,22}
-    py{36,37,38}-django{30}
+    py{36,37,38}-django{30,31}
     lint
 
 [testenv]
@@ -15,12 +15,13 @@ 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
 
 [testenv:lint]
 basepython = python3.6
 deps =
-    flake8==3.8.3
-    black==19.10b0
+    flake8==3.8.4
+    black==20.8b1
 commands =
     flake8 --max-line-length=88 django_migration_linter
     black --check django_migration_linter/ tests/ manage.py setup.py