Merge pull request #356 from maykinmedia/update-format-tools

Viicos · web-flow · commit 7c1e2b390199 · 2024-01-17T16:28:09.000+01:00
Update format tools
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Black update
+de05ba4ccf2c9a3c929705cee6f517bf74361a2c
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -173,7 +173,7 @@ mozilla-django-oidc==1.2.4
     # via mozilla-django-oidc-db
 oyaml==1.0
     # via vng-api-common
-packaging==20.9
+packaging==23.2
     # via drf-yasg
 phonenumbers==8.12.29
     # via maykin-django-two-factor-auth
@@ -193,8 +193,6 @@ pyjwt==2.4.0
     #   vng-api-common
 pyopenssl==20.0.1
     # via josepy
-pyparsing==2.4.7
-    # via packaging
 pyrsistent==0.17.3
     # via jsonschema
 python-dateutil==2.8.1
@@ -253,7 +251,7 @@ sqlparse==0.4.2
     # via django
 text-unidecode==1.3
     # via faker
-typing-extensions==3.10.0.2
+typing-extensions==4.7.1
     # via importlib-metadata
 unidecode==1.2.0
     # via vng-api-common
diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -259,7 +259,7 @@ oyaml==1.0
     # via
     #   -r requirements/base.txt
     #   vng-api-common
-packaging==20.9
+packaging==23.2
     # via
     #   -r requirements/base.txt
     #   drf-yasg
@@ -290,10 +290,6 @@ pyopenssl==20.0.1
     # via
     #   -r requirements/base.txt
     #   josepy
-pyparsing==2.4.7
-    # via
-    #   -r requirements/base.txt
-    #   packaging
 pyquery==1.4.3
     # via -r requirements/test-tools.in
 pyrsistent==0.17.3
@@ -381,7 +377,7 @@ text-unidecode==1.3
     # via
     #   -r requirements/base.txt
     #   faker
-typing-extensions==3.10.0.2
+typing-extensions==4.7.1
     # via
     #   -r requirements/base.txt
     #   importlib-metadata
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -6,8 +6,6 @@
 #
 alabaster==0.7.12
     # via sphinx
-appdirs==1.4.4
-    # via black
 attrs==20.3.0
     # via
     #   -r requirements/ci.txt
@@ -19,7 +17,7 @@ beautifulsoup4==4.9.3
     # via
     #   -r requirements/ci.txt
     #   webtest
-black==20.8b1
+black==23.3.0
     # via -r requirements/dev.in
 boltons==21.0.0
     # via
@@ -44,7 +42,7 @@ chardet==4.0.0
     # via
     #   -r requirements/ci.txt
     #   requests
-click==7.1.2
+click==8.1.7
     # via
     #   black
     #   pip-tools
@@ -243,6 +241,7 @@ imagesize==1.2.0
 importlib-metadata==4.8.1
     # via
     #   -r requirements/ci.txt
+    #   click
     #   flake8
     #   jsonschema
     #   markdown
@@ -260,7 +259,7 @@ isodate==0.6.0
     # via
     #   -r requirements/ci.txt
     #   vng-api-common
-isort==5.8.0
+isort==5.11.5
     # via -r requirements/dev.in
 itypes==1.2.0
     # via
@@ -307,12 +306,13 @@ oyaml==1.0
     # via
     #   -r requirements/ci.txt
     #   vng-api-common
-packaging==20.9
+packaging==23.2
     # via
     #   -r requirements/ci.txt
+    #   black
     #   drf-yasg
     #   sphinx
-pathspec==0.8.1
+pathspec==0.11.2
     # via black
 pep517==0.10.0
     # via pip-tools
@@ -324,6 +324,8 @@ pillow==9.0.1
     # via -r requirements/ci.txt
 pip-tools==6.0.1
     # via -r requirements/dev.in
+platformdirs==4.0.0
+    # via black
 polib==1.1.1
     # via
     #   -r requirements/ci.txt
@@ -353,10 +355,6 @@ pyopenssl==20.0.1
     # via
     #   -r requirements/ci.txt
     #   josepy
-pyparsing==2.4.7
-    # via
-    #   -r requirements/ci.txt
-    #   packaging
 pyquery==1.4.3
     # via -r requirements/ci.txt
 pyrsistent==0.17.3
@@ -395,8 +393,6 @@ redis==3.5.3
     # via
     #   -r requirements/ci.txt
     #   django-redis
-regex==2021.4.4
-    # via black
 requests-mock==1.8.0
     # via
     #   -r requirements/ci.txt
@@ -477,16 +473,17 @@ text-unidecode==1.3
     #   -r requirements/ci.txt
     #   faker
 toml==0.10.2
-    # via
-    #   black
-    #   pep517
+    # via pep517
+tomli==2.0.1
+    # via black
 typed-ast==1.4.3
     # via black
-typing-extensions==3.10.0.2
+typing-extensions==4.7.1
     # via
     #   -r requirements/ci.txt
     #   black
     #   importlib-metadata
+    #   platformdirs
 unidecode==1.2.0
     # via
     #   -r requirements/ci.txt
diff --git a/src/objects/accounts/migrations/0001_initial.py b/src/objects/accounts/migrations/0001_initial.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [
diff --git a/src/objects/accounts/migrations/0002_auto_20201012_1522.py b/src/objects/accounts/migrations/0002_auto_20201012_1522.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("accounts", "0001_initial"),
     ]
diff --git a/src/objects/accounts/migrations/0003_auto_20201223_1231.py b/src/objects/accounts/migrations/0003_auto_20201223_1231.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("accounts", "0002_auto_20201012_1522"),
     ]
diff --git a/src/objects/api/validators.py b/src/objects/api/validators.py
@@ -116,7 +116,6 @@ def __call__(self, attrs):
         try:
             response = client.retrieve("objecttype", url=object_type.url)
         except ClientError as exc:
-
             msg = f"Object type can not be retrieved: {exc.args[0]}"
             raise ValidationError(msg)
 
diff --git a/src/objects/core/migrations/0001_initial.py b/src/objects/core/migrations/0001_initial.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/src/objects/core/migrations/0002_auto_20200518_1707.py b/src/objects/core/migrations/0002_auto_20200518_1707.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0001_initial"),
     ]
diff --git a/src/objects/core/migrations/0003_objectrecord.py b/src/objects/core/migrations/0003_objectrecord.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0002_auto_20200518_1707"),
     ]
diff --git a/src/objects/core/migrations/0004_move_data_to_record.py b/src/objects/core/migrations/0004_move_data_to_record.py
@@ -22,7 +22,6 @@ def move_data_from_record(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0003_objectrecord"),
     ]
diff --git a/src/objects/core/migrations/0005_remove_object_data.py b/src/objects/core/migrations/0005_remove_object_data.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0004_move_data_to_record"),
     ]
diff --git a/src/objects/core/migrations/0006_auto_20200904_1402.py b/src/objects/core/migrations/0006_auto_20200904_1402.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0005_remove_object_data"),
     ]
diff --git a/src/objects/core/migrations/0007_auto_20200904_1403.py b/src/objects/core/migrations/0007_auto_20200904_1403.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0006_auto_20200904_1402"),
     ]
diff --git a/src/objects/core/migrations/0008_objectrecord_correct.py b/src/objects/core/migrations/0008_objectrecord_correct.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0007_auto_20200904_1403"),
     ]
diff --git a/src/objects/core/migrations/0009_objectrecord_version.py b/src/objects/core/migrations/0009_objectrecord_version.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0008_objectrecord_correct"),
     ]
diff --git a/src/objects/core/migrations/0010_move_version_to_record.py b/src/objects/core/migrations/0010_move_version_to_record.py
@@ -19,7 +19,6 @@ def move_version_from_record(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0009_objectrecord_version"),
     ]
diff --git a/src/objects/core/migrations/0011_remove_object_version.py b/src/objects/core/migrations/0011_remove_object_version.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0010_move_version_to_record"),
     ]
diff --git a/src/objects/core/migrations/0012_objectrecord_uuid.py b/src/objects/core/migrations/0012_objectrecord_uuid.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0011_remove_object_version"),
     ]
diff --git a/src/objects/core/migrations/0013_generate_record_uuids.py b/src/objects/core/migrations/0013_generate_record_uuids.py
@@ -11,7 +11,6 @@ def generate_record_uuids(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0012_objectrecord_uuid"),
     ]
diff --git a/src/objects/core/migrations/0014_auto_20200915_1740.py b/src/objects/core/migrations/0014_auto_20200915_1740.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0013_generate_record_uuids"),
     ]
diff --git a/src/objects/core/migrations/0015_objectrecord_geometry.py b/src/objects/core/migrations/0015_objectrecord_geometry.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0014_auto_20200915_1740"),
     ]
diff --git a/src/objects/core/migrations/0016_auto_20210111_1649.py b/src/objects/core/migrations/0016_auto_20210111_1649.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0015_objectrecord_geometry"),
     ]
diff --git a/src/objects/core/migrations/0017_auto_20210111_1653.py b/src/objects/core/migrations/0017_auto_20210111_1653.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0016_auto_20210111_1649"),
     ]
diff --git a/src/objects/core/migrations/0018_auto_20210113_1239.py b/src/objects/core/migrations/0018_auto_20210113_1239.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0017_auto_20210111_1653"),
     ]
diff --git a/src/objects/core/migrations/0019_fill_record_index.py b/src/objects/core/migrations/0019_fill_record_index.py
@@ -22,7 +22,6 @@ def fill_record_index(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0018_auto_20210113_1239"),
     ]
diff --git a/src/objects/core/migrations/0020_auto_20210118_1117.py b/src/objects/core/migrations/0020_auto_20210118_1117.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0019_fill_record_index"),
     ]
diff --git a/src/objects/core/migrations/0021_auto_20201222_1745.py b/src/objects/core/migrations/0021_auto_20201222_1745.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("zgw_consumers", "0011_remove_service_extra"),
         ("core", "0020_auto_20210118_1117"),
diff --git a/src/objects/core/migrations/0022_move_object_types_to_separate_model.py b/src/objects/core/migrations/0022_move_object_types_to_separate_model.py
@@ -68,7 +68,6 @@ def move_objecttypes_from_model(apps, _):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0021_auto_20201222_1745"),
         ("zgw_consumers", "0011_remove_service_extra"),
diff --git a/src/objects/core/migrations/0023_remove_object_object_type.py b/src/objects/core/migrations/0023_remove_object_object_type.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0022_move_object_types_to_separate_model"),
     ]
diff --git a/src/objects/core/migrations/0024_auto_20201222_1811.py b/src/objects/core/migrations/0024_auto_20201222_1811.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("core", "0023_remove_object_object_type"),
     ]
diff --git a/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py b/src/objects/core/migrations/0025_delete_objects_with_empty_object_type.py
diff --git a/src/objects/core/migrations/0026_auto_20201222_1833.py b/src/objects/core/migrations/0026_auto_20201222_1833.py
diff --git a/src/objects/core/migrations/0027_auto_20211203_1209.py b/src/objects/core/migrations/0027_auto_20211203_1209.py
diff --git a/src/objects/core/utils.py b/src/objects/core/utils.py
diff --git a/src/objects/tests/test_merge_patch.py b/src/objects/tests/test_merge_patch.py
diff --git a/src/objects/token/migrations/0001_initial.py b/src/objects/token/migrations/0001_initial.py
diff --git a/src/objects/token/migrations/0002_auto_20201223_1231.py b/src/objects/token/migrations/0002_auto_20201223_1231.py
diff --git a/src/objects/token/migrations/0003_auto_20210312_1507.py b/src/objects/token/migrations/0003_auto_20210312_1507.py
diff --git a/src/objects/token/migrations/0004_auto_20210315_1537.py b/src/objects/token/migrations/0004_auto_20210315_1537.py
diff --git a/src/objects/token/migrations/0005_auto_20210623_1242.py b/src/objects/token/migrations/0005_auto_20210623_1242.py
diff --git a/src/objects/token/migrations/0006_auto_20210721_1543.py b/src/objects/token/migrations/0006_auto_20210721_1543.py
diff --git a/src/objects/token/migrations/0007_remove_permission_fields.py b/src/objects/token/migrations/0007_remove_permission_fields.py
diff --git a/src/objects/token/migrations/0008_permission_fields.py b/src/objects/token/migrations/0008_permission_fields.py
diff --git a/src/objects/utils/migration_operations.py b/src/objects/utils/migration_operations.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Black update`
	`2`	`+de05ba4ccf2c9a3c929705cee6f517bf74361a2c`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`
`6`	`6`	`class Migration(migrations.Migration):`
`7`		`-`
`8`	`7`	`dependencies = [`
`9`	`8`	`("accounts", "0001_initial"),`
`10`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`class Migration(migrations.Migration):`
`8`		`-`
`9`	`8`	`dependencies = [`
`10`	`9`	`("core", "0001_initial"),`
`11`	`10`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`
`9`	`9`	`class Migration(migrations.Migration):`
`10`		`-`
`11`	`10`	`dependencies = [`
`12`	`11`	`("core", "0002_auto_20200518_1707"),`
`13`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ def move_data_from_record(apps, _):`
`22`	`22`
`23`	`23`
`24`	`24`	`class Migration(migrations.Migration):`
`25`		`-`
`26`	`25`	`dependencies = [`
`27`	`26`	`("core", "0003_objectrecord"),`
`28`	`27`	`]`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ def move_version_from_record(apps, _):`
`19`	`19`
`20`	`20`
`21`	`21`	`class Migration(migrations.Migration):`
`22`		`-`
`23`	`22`	`dependencies = [`
`24`	`23`	`("core", "0009_objectrecord_version"),`
`25`	`24`	`]`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ def generate_record_uuids(apps, _):`
`11`	`11`
`12`	`12`
`13`	`13`	`class Migration(migrations.Migration):`
`14`		`-`
`15`	`14`	`dependencies = [`
`16`	`15`	`("core", "0012_objectrecord_uuid"),`
`17`	`16`	`]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`
`8`	`8`	`class Migration(migrations.Migration):`
`9`		`-`
`10`	`9`	`dependencies = [`
`11`	`10`	`("core", "0016_auto_20210111_1649"),`
`12`	`11`	`]`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ def fill_record_index(apps, _):`
`22`	`22`
`23`	`23`
`24`	`24`	`class Migration(migrations.Migration):`
`25`		`-`
`26`	`25`	`dependencies = [`
`27`	`26`	`("core", "0018_auto_20210113_1239"),`
`28`	`27`	`]`