From 7a154cfa340819363f1f076e7d96b4464a56ae8a Mon Sep 17 00:00:00 2001
From: Mohamed ElKalioby <mkalioby@mkalioby.com>
Date: Sun, 30 May 2021 09:24:25 +0300
Subject: [PATCH] Releasing v2.2.0

---
 CHANGELOG.md                              |  7 ++++---
 mfa/__init__.py                           |  2 +-
 mfa/migrations/0011_auto_20210530_0622.py | 18 ++++++++++++++++++
 mfa/models.py                             |  2 +-
 setup.py                                  |  6 ++++--
 5 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 mfa/migrations/0011_auto_20210530_0622.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 182523f..1afe5f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Change Log
 
-## 2.2.0 (Not released)
-   * Added: MFA_REDIRECT_AFTER_REGISTRATION settings parameter 
+## 2.2.0
+   * Added: MFA_REDIRECT_AFTER_REGISTRATION settings parameter
+   * Fixed: Deprecation error for NULBooleanField
 
 ## 2.1.2
   * Fixed: Getting timestamp on Python 3.7 as ("%s") is raising an exception
@@ -9,7 +10,7 @@
 
 
 ## 2.1.1
-  * Fixed: FIDO2 version in requirments.txt file.
+  * Fixed: FIDO2 version in requirements.txt file.
   
 ## 2.1.0
    * Added Support for Touch ID for Mac OSx and iOS 14 on Safari
diff --git a/mfa/__init__.py b/mfa/__init__.py
index e5dafea..d9d106a 100644
--- a/mfa/__init__.py
+++ b/mfa/__init__.py
@@ -1 +1 @@
-__version__="2.2.0b1"
+__version__="2.2.0"
diff --git a/mfa/migrations/0011_auto_20210530_0622.py b/mfa/migrations/0011_auto_20210530_0622.py
new file mode 100644
index 0000000..3d215c2
--- /dev/null
+++ b/mfa/migrations/0011_auto_20210530_0622.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2 on 2021-05-30 06:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mfa', '0010_auto_20201110_0557'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user_keys',
+            name='owned_by_enterprise',
+            field=models.BooleanField(blank=True, default=None, null=True),
+        ),
+    ]
diff --git a/mfa/models.py b/mfa/models.py
index 2f0d682..d4eff59 100644
--- a/mfa/models.py
+++ b/mfa/models.py
@@ -15,7 +15,7 @@ class User_Keys(models.Model):
     enabled=models.BooleanField(default=True)
     expires=models.DateTimeField(null=True,default=None,blank=True)
     last_used=models.DateTimeField(null=True,default=None,blank=True)
-    owned_by_enterprise=models.NullBooleanField(default=None,null=True,blank=True)
+    owned_by_enterprise=models.BooleanField(default=None,null=True,blank=True)
 
     def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
         if self.key_type == "Trusted Device" and self.properties.get("signature","") == "":
diff --git a/setup.py b/setup.py
index 8958ee5..ae6cc81 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='django-mfa2',
-    version='2.2.0b1',
+    version='2.2.0',
     description='Allows user to add 2FA to their accounts',
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
@@ -31,12 +31,14 @@
     include_package_data=True,
     zip_safe=False, # because we're including static files
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Environment :: Web Environment",
         "Framework :: Django",
         "Framework :: Django :: 2.0",
         "Framework :: Django :: 2.1",
         "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 3.1",
         "Intended Audience :: Developers",
         "Operating System :: OS Independent",
         "Programming Language :: Python",