diff --git a/api/funkwhale_api/common/migrations/0002_mutation.py b/api/funkwhale_api/common/migrations/0002_mutation.py index f1f756fd3..cf2d04429 100644 --- a/api/funkwhale_api/common/migrations/0002_mutation.py +++ b/api/funkwhale_api/common/migrations/0002_mutation.py @@ -36,8 +36,8 @@ class Migration(migrations.Migration): models.UUIDField(db_index=True, default=uuid.uuid4, unique=True), ), ("type", models.CharField(db_index=True, max_length=100)), - ("is_approved", models.NullBooleanField(default=None)), - ("is_applied", models.NullBooleanField(default=None)), + ("is_approved", models.BooleanField(default=None, null=True)), + ("is_applied", models.BooleanField(default=None, null=True)), ( "creation_date", models.DateTimeField( diff --git a/api/funkwhale_api/federation/migrations/0001_initial.py b/api/funkwhale_api/federation/migrations/0001_initial.py index a4c641b4e..9691135b4 100644 --- a/api/funkwhale_api/federation/migrations/0001_initial.py +++ b/api/funkwhale_api/federation/migrations/0001_initial.py @@ -75,7 +75,7 @@ class Migration(migrations.Migration): "last_fetch_date", models.DateTimeField(default=django.utils.timezone.now), ), - ("manually_approves_followers", models.NullBooleanField(default=None)), + ("manually_approves_followers", models.BooleanField(default=None, null=True)), ], ) ] diff --git a/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py b/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py index 021b2ad1c..61a94a343 100644 --- a/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py +++ b/api/funkwhale_api/federation/migrations/0003_auto_20180407_1010.py @@ -77,7 +77,7 @@ class Migration(migrations.Migration): models.DateTimeField(default=django.utils.timezone.now), ), ("modification_date", models.DateTimeField(auto_now=True)), - ("approved", models.NullBooleanField(default=None)), + ("approved", models.BooleanField(default=None, null=True)), ( "actor", models.ForeignKey( diff --git a/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py b/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py index f0e5cf1d6..45b286505 100644 --- a/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py +++ b/api/funkwhale_api/federation/migrations/0004_auto_20180410_2025.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="follow", name="approved", - field=models.NullBooleanField(default=None), + field=models.BooleanField(default=None, null=True), ), migrations.AddField( model_name="library", diff --git a/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py b/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py index 65bbc4cd8..43337f3ef 100644 --- a/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py +++ b/api/funkwhale_api/federation/migrations/0007_auto_20180807_1748.py @@ -43,7 +43,7 @@ class Migration(migrations.Migration): "creation_date", models.DateTimeField(default=django.utils.timezone.now), ), - ("delivered", models.NullBooleanField(default=None)), + ("delivered", models.BooleanField(default=None, null=True)), ("delivered_date", models.DateTimeField(blank=True, null=True)), ], ), @@ -69,7 +69,7 @@ class Migration(migrations.Migration): models.DateTimeField(default=django.utils.timezone.now), ), ("modification_date", models.DateTimeField(auto_now=True)), - ("approved", models.NullBooleanField(default=None)), + ("approved", models.BooleanField(default=None, null=True)), ], ), migrations.RenameField("actor", "url", "fid"), diff --git a/api/poetry.lock b/api/poetry.lock index a12ce0fc3..cf3c778ae 100644 --- a/api/poetry.lock +++ b/api/poetry.lock @@ -789,14 +789,14 @@ python-magic = ">=0.4.15,<1.0.0" [[package]] name = "djangorestframework" -version = "3.13.1" +version = "3.14.0" description = "Web APIs for Django, made easy." category = "main" optional = false python-versions = ">=3.6" [package.dependencies] -django = ">=2.2" +django = ">=3.0" pytz = "*" [[package]] @@ -2199,7 +2199,7 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "835a2bc1b847dea3d2b5e5296122b317fbe83160a0bbf1e742460f5fa2304a03" +content-hash = "7ade17324f337c8150cadf12621f37115be4c5c63be8e10ca769495ac296d60c" [metadata.files] aiohttp = [ @@ -2680,8 +2680,8 @@ django-versatileimagefield = [ {file = "django_versatileimagefield-2.2-py2.py3-none-any.whl", hash = "sha256:03766f4d2332f192978879fdb196e18c53e6ccef6c55c5c26b59747b76a97288"}, ] djangorestframework = [ - {file = "djangorestframework-3.13.1-py3-none-any.whl", hash = "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa"}, - {file = "djangorestframework-3.13.1.tar.gz", hash = "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee"}, + {file = "djangorestframework-3.14.0-py3-none-any.whl", hash = "sha256:eb63f58c9f218e1a7d064d17a70751f528ed4e1d35547fdade9aaf4cd103fd08"}, + {file = "djangorestframework-3.14.0.tar.gz", hash = "sha256:579a333e6256b09489cbe0a067e66abe55c6595d8926be6b99423786334350c8"}, ] drf-spectacular = [ {file = "drf-spectacular-0.24.2.tar.gz", hash = "sha256:be32417594080a52f996afd83fd47ea9c2b83cbf13f6d3fbf3de809a0dfa7ead"}, diff --git a/api/pyproject.toml b/api/pyproject.toml index 80508b58c..cbbffadad 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -19,7 +19,7 @@ kombu = "==5.2.4" celery = "==5.2.7" django-cors-headers = "==3.13.0" musicbrainzngs = "==0.7.1" -djangorestframework = "==3.13.1" +djangorestframework = "==3.14.0" arrow = "==1.2.3" persisting-theory = "==1.0" django-versatileimagefield = "==2.2"