Merge pull request #976 from trowik/maintenance

chore: update dependencies and format code
adfinis · Jun 28, 2023 · 5d8cef4 · 5d8cef4
2 parents 3e06680 + c4822ff
commit 5d8cef4
Show file tree

Hide file tree

Showing 67 changed files with 260 additions and 347 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -19,50 +19,50 @@ classifiers = [
 include = ["CHANGELOG.md"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 python-dateutil = "^2.8.2"
 django = "^3.2.19"
 # might remove this once we find out how the jsonapi extras_require work
-django-cors-headers = "^3.13.0"
-django-filter = "^21.1"
+django-cors-headers = "^4.1.0"
+django-filter = "^23.2"
 django-multiselectfield = "^0.1.12"
-django-prometheus = "^2.2.0"
-djangorestframework = "^3.13.1"
-djangorestframework-jsonapi = "^5.0.0"
-mozilla-django-oidc = "^2.0.0"
+django-prometheus = "^2.3.1"
+djangorestframework = "^3.14.0"
+djangorestframework-jsonapi = "^6.0.0"
+mozilla-django-oidc = "^3.0.0"
 psycopg2-binary = "^2.9.3"
-pytz = "^2022.1"
+pytz = "^2023.3"
 pyexcel-webio = "^0.1.4"
 pyexcel-io = "^0.6.6"
 django-excel = "^0.0.10"
 django-nested-inline = "^0.4.5"
 pyexcel-ods3 = "^0.6.1"
 pyexcel-xlsx = "^0.6.0"
 pyexcel-ezodf = "^0.3.4"
-django-environ = "^0.8.1"
-django-money = "^2.1.1"
-python-redmine = "^2.3.0"
-sentry-sdk = "^1.9.5"
-whitenoise = "^6.2.0"
+django-environ = "^0.10.0"
+django-money = "^3.1.0"
+python-redmine = "^2.4.0"
+sentry-sdk = "^1.26.0"
+whitenoise = "^6.5.0"
 django-hurricane = "^1.3.4"
 openpyxl = "3.0.10" # TODO: dependency of `pyexcel-xlsx` Remove as soon as https://github.com/pyexcel/pyexcel-xlsx/issues/52 is resolved.
 
 [tool.poetry.dev-dependencies]
-black = "22.3.0"
-coverage = "6.4.1"
-django-extensions = "3.2.1"
+black = "23.3.0"
+coverage = "7.2.7"
+django-extensions = "3.2.3"
 factory-boy = "3.2.1"
-flake8 = "4.0.1"
+flake8 = "6.0.0"
 flake8-blind-except = "0.2.1"
 flake8-debugger = "4.1.2"
-flake8-deprecated = "1.3"
-flake8-docstrings = "1.6.0"
-flake8-isort = "4.1.1"
+flake8-deprecated = "2.0.1"
+flake8-docstrings = "1.7.0"
+flake8-isort = "6.0.0"
 flake8-string-format = "0.3.0"
-ipdb = "0.13.9"
-isort = "5.10.1"
+ipdb = "0.13.13"
+isort = "5.12.0"
 pdbpp = "0.10.3"
-pytest = "7.2.1"
+pytest = "7.4.0"
 pytest-cov = "4.0.0"
 pytest-django = "4.5.2"
 pytest-env = "0.6.2"

diff --git a/timed/conftest.py b/timed/conftest.py
@@ -161,7 +161,6 @@ def setup_customer_and_employment_status(
             user=user, is_customer=is_customer
         )
     if is_employed:
-
         employment = employment_factories.EmploymentFactory.create(
             user=user, is_external=is_external
         )

diff --git a/timed/employment/filters.py b/timed/employment/filters.py
@@ -76,7 +76,6 @@ class EmploymentFilterSet(FilterSet):
     date = DateFilter(method="filter_date")
 
     def filter_date(self, queryset, name, value):
-
         queryset = queryset.filter(
             Q(start_date__lte=value)
             & Q(Q(end_date__gte=value) | Q(end_date__isnull=True))

diff --git a/timed/employment/migrations/0001_initial.py b/timed/employment/migrations/0001_initial.py
@@ -13,7 +13,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [("auth", "0008_alter_user_username_max_length")]

diff --git a/timed/employment/migrations/0002_auto_20170823_1051.py b/timed/employment/migrations/0002_auto_20170823_1051.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0001_initial")]
 
     operations = [

diff --git a/timed/employment/migrations/0003_user_tour_done.py b/timed/employment/migrations/0003_user_tour_done.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0002_auto_20170823_1051")]
 
     operations = [

diff --git a/timed/employment/migrations/0004_auto_20170904_1510.py b/timed/employment/migrations/0004_auto_20170904_1510.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0003_user_tour_done")]
 
     operations = [

diff --git a/timed/employment/migrations/0005_auto_20170906_1259.py b/timed/employment/migrations/0005_auto_20170906_1259.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0004_auto_20170904_1510")]
 
     operations = [

diff --git a/timed/employment/migrations/0006_auto_20170906_1635.py b/timed/employment/migrations/0006_auto_20170906_1635.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0005_auto_20170906_1259")]
 
     operations = [

diff --git a/timed/employment/migrations/0007_auto_20170911_0959.py b/timed/employment/migrations/0007_auto_20170911_0959.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0006_auto_20170906_1635")]
 
     operations = [

diff --git a/timed/employment/migrations/0008_auto_20171013_1041.py b/timed/employment/migrations/0008_auto_20171013_1041.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0007_auto_20170911_0959")]
 
     operations = [

diff --git a/timed/employment/migrations/0009_delete_userabsencetype.py b/timed/employment/migrations/0009_delete_userabsencetype.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0008_auto_20171013_1041")]
 
     operations = [migrations.DeleteModel(name="UserAbsenceType")]
diff --git a/timed/employment/migrations/0010_overtimecredit_comment.py b/timed/employment/migrations/0010_overtimecredit_comment.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0009_delete_userabsencetype")]
 
     operations = [

diff --git a/timed/employment/migrations/0011_auto_20171101_1227.py b/timed/employment/migrations/0011_auto_20171101_1227.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0010_overtimecredit_comment")]
 
     operations = [

diff --git a/timed/employment/migrations/0012_auto_20181026_1528.py b/timed/employment/migrations/0012_auto_20181026_1528.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("employment", "0011_auto_20171101_1227")]
 
     operations = [

diff --git a/timed/employment/migrations/0013_auto_20210302_1136.py b/timed/employment/migrations/0013_auto_20210302_1136.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("employment", "0012_auto_20181026_1528"),
     ]

diff --git a/timed/employment/migrations/0014_employment_is_external.py b/timed/employment/migrations/0014_employment_is_external.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("employment", "0013_auto_20210302_1136"),
     ]

diff --git a/timed/employment/migrations/0015_user_is_accountant.py b/timed/employment/migrations/0015_user_is_accountant.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("employment", "0014_employment_is_external"),
     ]

diff --git a/timed/employment/serializers.py b/timed/employment/serializers.py
@@ -20,7 +20,6 @@
 
 
 class UserSerializer(ModelSerializer):
-
     included_serializers = {
         "supervisors": "timed.employment.serializers.UserSerializer",
         "supervisees": "timed.employment.serializers.UserSerializer",

diff --git a/timed/employment/tests/test_worktime_balance.py b/timed/employment/tests/test_worktime_balance.py
@@ -177,7 +177,6 @@ def test_worktime_balance_list_filter_user(auth_client):
 def test_worktime_balance_list_last_reported_date_no_reports(
     auth_client, django_assert_num_queries
 ):
-
     url = reverse("worktime-balance-list")
 
     with django_assert_num_queries(1):
@@ -193,7 +192,6 @@ def test_worktime_balance_list_last_reported_date_no_reports(
 def test_worktime_balance_list_last_reported_date(
     auth_client, django_assert_num_queries
 ):
-
     EmploymentFactory.create(
         user=auth_client.user,
         start_date=date(2017, 2, 1),

diff --git a/timed/notifications/migrations/0001_initial.py b/timed/notifications/migrations/0001_initial.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

diff --git a/timed/notifications/migrations/0002_alter_notification_notification_type.py b/timed/notifications/migrations/0002_alter_notification_notification_type.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("notifications", "0001_initial"),
     ]

diff --git a/timed/projects/migrations/0001_initial.py b/timed/projects/migrations/0001_initial.py
@@ -8,7 +8,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [migrations.swappable_dependency(settings.AUTH_USER_MODEL)]

diff --git a/timed/projects/migrations/0002_auto_20170823_1045.py b/timed/projects/migrations/0002_auto_20170823_1045.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0001_initial")]
 
     operations = [

diff --git a/timed/projects/migrations/0003_auto_20170831_1624.py b/timed/projects/migrations/0003_auto_20170831_1624.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0002_auto_20170823_1045")]
 
     operations = [

diff --git a/timed/projects/migrations/0004_auto_20170906_1045.py b/timed/projects/migrations/0004_auto_20170906_1045.py
@@ -22,7 +22,6 @@ def migrate_estimated_hours(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0003_auto_20170831_1624")]
 
     operations = [

diff --git a/timed/projects/migrations/0005_auto_20170907_0938.py b/timed/projects/migrations/0005_auto_20170907_0938.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0004_auto_20170906_1045")]
 
     operations = [

diff --git a/timed/projects/migrations/0006_auto_20171010_1423.py b/timed/projects/migrations/0006_auto_20171010_1423.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0005_auto_20170907_0938")]
 
     operations = [

diff --git a/timed/projects/migrations/0007_project_subscription_project.py b/timed/projects/migrations/0007_project_subscription_project.py
@@ -16,7 +16,6 @@ def migrate_projects(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0006_auto_20171010_1423"),
         ("subscription", "0003_auto_20170907_1151"),

diff --git a/timed/projects/migrations/0008_auto_20190220_1133.py b/timed/projects/migrations/0008_auto_20190220_1133.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [("projects", "0007_project_subscription_project")]
 
     operations = [

diff --git a/timed/projects/migrations/0009_auto_20201201_1412.py b/timed/projects/migrations/0009_auto_20201201_1412.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0008_auto_20190220_1133"),
     ]

diff --git a/timed/projects/migrations/0010_project_billed.py b/timed/projects/migrations/0010_project_billed.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0009_auto_20201201_1412"),
     ]

diff --git a/timed/projects/migrations/0011_auto_20210419_1459.py b/timed/projects/migrations/0011_auto_20210419_1459.py
@@ -6,7 +6,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("projects", "0010_project_billed"),

diff --git a/timed/projects/migrations/0012_migrate_reviewers_to_assignees.py b/timed/projects/migrations/0012_migrate_reviewers_to_assignees.py
@@ -16,7 +16,6 @@ def migrate_reviewers(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0011_auto_20210419_1459"),
     ]

diff --git a/timed/projects/migrations/0013_remove_project_reviewers.py b/timed/projects/migrations/0013_remove_project_reviewers.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0012_migrate_reviewers_to_assignees"),
     ]

diff --git a/timed/projects/migrations/0014_add_is_customer_role_to_assignees.py b/timed/projects/migrations/0014_add_is_customer_role_to_assignees.py
@@ -4,7 +4,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0013_remove_project_reviewers"),
     ]

diff --git a/timed/projects/migrations/0015_remaining_effort_task_project.py b/timed/projects/migrations/0015_remaining_effort_task_project.py
@@ -5,7 +5,6 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("projects", "0014_add_is_customer_role_to_assignees"),
     ]

diff --git a/timed/redmine/migrations/0001_initial.py b/timed/redmine/migrations/0001_initial.py
@@ -7,7 +7,6 @@
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [("projects", "0001_initial")]

diff --git a/timed/reports/filters.py b/timed/reports/filters.py
@@ -77,7 +77,6 @@ def filter_cost_center(self, queryset, name, value):
             return queryset.filter_base(filter_q).filter_aggregate(filter_q)
 
     def filter_queryset(self, queryset):
-
         qs = super().filter_queryset(queryset)
 
         duration_ref = self._refs["reports_ref"] + "__duration"