From 8890b3beb5b31c7f36d5dd71b69afedc10ecf2f9 Mon Sep 17 00:00:00 2001
From: Wiktork <wiktor.kepczynski@adfinis.com>
Date: Thu, 28 Dec 2023 10:40:50 +0100
Subject: [PATCH] chore(deps): update dependencies

---
 emeis/core/filters.py                         |  1 -
 emeis/core/migrations/0001_initial.py         |  1 -
 emeis/core/migrations/0003_localized_city.py  |  1 -
 .../migrations/0004_use_abstract_base_user.py |  1 -
 .../migrations/0005_manager_on_user_model.py  |  1 -
 .../0006_rename_field_meta_metainfo.py        |  1 -
 ..._JSONField_to_native_django_model_field.py |  1 -
 emeis/core/migrations/0008_scope_is_active.py |  1 -
 .../migrations/0009_alter_scope_parent.py     |  1 -
 emeis/core/migrations/0010_scope_full_name.py |  1 -
 emeis/core/tests/test_create_scope_command.py |  4 +-
 emeis/core/tests/test_filters.py              |  1 -
 emeis/core/tests/test_visibility.py           |  1 -
 requirements-base.txt                         | 25 +++++------
 requirements-dev.txt                          | 43 ++++++++++---------
 15 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/emeis/core/filters.py b/emeis/core/filters.py
index 257b53f8..5fe3773c 100644
--- a/emeis/core/filters.py
+++ b/emeis/core/filters.py
@@ -105,7 +105,6 @@ def _make_ordering_field(self, field, view):
         try:
             model_field = view.queryset.model._meta.get_field(field_name)
             if isinstance(model_field, LocalizedField):
-
                 field_col = KeyTransform(lang, field_name)
         except FieldDoesNotExist:
             # This happens with metainfo__foobar style lookups,
diff --git a/emeis/core/migrations/0001_initial.py b/emeis/core/migrations/0001_initial.py
index ba015c75..7ca8db8a 100644
--- a/emeis/core/migrations/0001_initial.py
+++ b/emeis/core/migrations/0001_initial.py
@@ -14,7 +14,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []
diff --git a/emeis/core/migrations/0003_localized_city.py b/emeis/core/migrations/0003_localized_city.py
index c9355ab9..2d7f4899 100644
--- a/emeis/core/migrations/0003_localized_city.py
+++ b/emeis/core/migrations/0003_localized_city.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0002_data_bootstrap"),
     ]
diff --git a/emeis/core/migrations/0004_use_abstract_base_user.py b/emeis/core/migrations/0004_use_abstract_base_user.py
index 79ef6864..e72b95a6 100644
--- a/emeis/core/migrations/0004_use_abstract_base_user.py
+++ b/emeis/core/migrations/0004_use_abstract_base_user.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0003_localized_city"),
     ]
diff --git a/emeis/core/migrations/0005_manager_on_user_model.py b/emeis/core/migrations/0005_manager_on_user_model.py
index 85142fc5..44cbf312 100644
--- a/emeis/core/migrations/0005_manager_on_user_model.py
+++ b/emeis/core/migrations/0005_manager_on_user_model.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0004_use_abstract_base_user"),
     ]
diff --git a/emeis/core/migrations/0006_rename_field_meta_metainfo.py b/emeis/core/migrations/0006_rename_field_meta_metainfo.py
index 5f4018ab..5b6ced32 100644
--- a/emeis/core/migrations/0006_rename_field_meta_metainfo.py
+++ b/emeis/core/migrations/0006_rename_field_meta_metainfo.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0005_manager_on_user_model"),
     ]
diff --git a/emeis/core/migrations/0007_change_JSONField_to_native_django_model_field.py b/emeis/core/migrations/0007_change_JSONField_to_native_django_model_field.py
index 8e7cce4c..d3f672a9 100644
--- a/emeis/core/migrations/0007_change_JSONField_to_native_django_model_field.py
+++ b/emeis/core/migrations/0007_change_JSONField_to_native_django_model_field.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0006_rename_field_meta_metainfo"),
     ]
diff --git a/emeis/core/migrations/0008_scope_is_active.py b/emeis/core/migrations/0008_scope_is_active.py
index afcf69d0..f36fda1b 100644
--- a/emeis/core/migrations/0008_scope_is_active.py
+++ b/emeis/core/migrations/0008_scope_is_active.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0007_change_JSONField_to_native_django_model_field"),
     ]
diff --git a/emeis/core/migrations/0009_alter_scope_parent.py b/emeis/core/migrations/0009_alter_scope_parent.py
index 311c3f95..60317221 100644
--- a/emeis/core/migrations/0009_alter_scope_parent.py
+++ b/emeis/core/migrations/0009_alter_scope_parent.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0008_scope_is_active"),
     ]
diff --git a/emeis/core/migrations/0010_scope_full_name.py b/emeis/core/migrations/0010_scope_full_name.py
index 3bd52801..620a85fd 100644
--- a/emeis/core/migrations/0010_scope_full_name.py
+++ b/emeis/core/migrations/0010_scope_full_name.py
@@ -15,7 +15,6 @@ def set_full_name(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("emeis_core", "0009_alter_scope_parent"),
     ]
diff --git a/emeis/core/tests/test_create_scope_command.py b/emeis/core/tests/test_create_scope_command.py
index f54a6dfe..25736132 100644
--- a/emeis/core/tests/test_create_scope_command.py
+++ b/emeis/core/tests/test_create_scope_command.py
@@ -8,7 +8,7 @@
 
 
 def _replace_in_text(in_str, **kwargs):
-    if type(in_str) == dict:
+    if isinstance(in_str, dict):
         return {k: _replace_in_text(v, **kwargs) for k, v in in_str.items()}
     for key, val in kwargs.items():
         in_str = in_str.replace(f"${key}", str(val))
@@ -168,7 +168,7 @@ def replace_expectations(in_str):
         assert new_scope != scope
 
     stdout, stderr = capsys.readouterr()
-    if type(expect_out) == dict:
+    if isinstance(expect_out, dict):
         assert json.loads(stdout) == expect_out
     else:
         assert stdout.strip() == expect_out.strip()
diff --git a/emeis/core/tests/test_filters.py b/emeis/core/tests/test_filters.py
index c882daf5..208fe8fc 100644
--- a/emeis/core/tests/test_filters.py
+++ b/emeis/core/tests/test_filters.py
@@ -19,7 +19,6 @@
     "partial_search", [lambda val: val[:-2], lambda val: val[2:], lambda val: val]
 )
 def test_search_users(admin_client, acl_factory, user_attribute, partial_search):
-
     users_list = [acl.user for acl in acl_factory.create_batch(5)]
 
     resp = admin_client.get(
diff --git a/emeis/core/tests/test_visibility.py b/emeis/core/tests/test_visibility.py
index 69d467f5..d744146f 100644
--- a/emeis/core/tests/test_visibility.py
+++ b/emeis/core/tests/test_visibility.py
@@ -19,7 +19,6 @@ def test_own_and_admin_visibility(
     user,
     requesting_user,
 ):
-
     settings.GENERIC_PERMISSIONS_VISIBILITY_CLASSES = [
         "emeis.core.visibilities.OwnAndAdmin"
     ]
diff --git a/requirements-base.txt b/requirements-base.txt
index e51e3ab0..de805e9c 100644
--- a/requirements-base.txt
+++ b/requirements-base.txt
@@ -1,16 +1,17 @@
 django~=3.2
-django-cors-headers==3.11.0
-django-environ~=0.9
-django-filter==22.1
+django-cors-headers==4.1.0
+django-environ~=0.11.2
+django-filter==23.5
 django-generic-api-permissions==0.2.0
-django-localized-fields==6.6
-django_mptt==0.13.4
-django-postgres-extra==2.0.5
-djangorestframework==3.13.1
-djangorestframework-jsonapi==5.0.0
-mozilla-django-oidc==2.0.0
+django-localized-fields==6.7
+django_mptt==0.15.0
+django-postgres-extra==2.0.8
+djangorestframework==3.14.0
+djangorestframework-jsonapi==6.1.0
+mozilla-django-oidc==3.0.0
 pyexcel==0.7.0
 pyexcel-xlsx==0.6.0
-requests==2.27.1
-uwsgi==2.0.22
-openpyxl==3.0.10
+requests==2.31.0
+uwsgi==2.0.23
+openpyxl==3.0.10 # TODO: dependency of `pyexcel-xlsx` Remove as soon as https://github.com/pyexcel/pyexcel-xlsx/issues/52 is resolved.
+
diff --git a/requirements-dev.txt b/requirements-dev.txt
index dc332cca..ca4c7307 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,31 +1,32 @@
 -r requirements-base.txt
-black==22.6.0
-django_extensions==3.1.5
-factory-boy==3.2.1
-flake8==5.0.4
+black==23.12.1
+django_extensions==3.2.3
+factory-boy==3.3.0
+flake8==6.1.0
 flake8-blind-except==0.2.1
-flake8-bugbear==22.6.22
+flake8-bugbear==23.12.2
 flake8-debugger~=4.1
-flake8-docstrings==1.6.0
-flake8-isort==4.2.0
+flake8-docstrings==1.7.0
+flake8-isort==6.1.1
 flake8-string-format==0.3.0
 flake8-tuple==0.4.1
-gitlint==0.17.0
-hypothesis==6.48.2
-ipython==8.2.0
-isort==5.10.1
+gitlint==0.19.1
+hypothesis==6.92.2
+ipython==8.18.1
+isort==5.13.2
 pdbpp==0.10.3
 pre_commit~=2.20
-psycopg2-binary==2.9.3
-pytest==7.1.3
-pytest-cov==3.0.0
-pytest-django==4.5.2
-pytest-env==0.6.2
+psycopg2-binary==2.9.9
+pytest==7.4.3
+pytest-cov==4.1.0
+pytest-django==4.7.0
+pytest-env==1.1.3
+# pytest-factoryboy needs to stay at 2.1.0 because of wrong interpretation of parameters with "__"
 pytest-factoryboy==2.1.0
 pytest-freezegun==0.4.2
-pytest-mock==3.7.0
-pytest-randomly==3.11.0
-python-semantic-release==7.31.4
-requests-mock==1.10.0
+pytest-mock==3.12.0
+pytest-randomly==3.15.0
+python-semantic-release==8.7.0
+requests-mock==1.11.0
 snapshottest==0.6.0
-werkzeug==2.2.3
+werkzeug==3.0.1