Merge pull request #238 from City-of-Helsinki/KK-802-upgrade-all-dependencies

KK-802 | Upgrade all dependencies

Author: tuomas777

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:10
+        image: postgres:11
         ports:
           - 5432:5432
         options: >-
@@ -35,10 +35,10 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
 
       - name: Cache pip packages
         uses: actions/cache@v2
@@ -70,10 +70,10 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.7
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: '3.7'
+          python-version: '3.9'
 
       - name: Cache pip packages
         uses: actions/cache@v2

.pre-commit-config.yaml

@@ -2,15 +2,15 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v4.3.21
+    rev: v5.9.3
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 21.9b0
     hooks:
       - id: black
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 4.0.1
     hooks:
       - id: flake8
-        exclude: migrations|snapshots
+        exclude: migrations|snapshots

Dockerfile

@@ -1,5 +1,5 @@
 # ==============================
-FROM helsinkitest/python:3.7-slim as appbase
+FROM helsinkitest/python:3.9-slim as appbase
 # ==============================
 RUN mkdir /entrypoint
 

README.md

@@ -24,8 +24,8 @@ The project is now running at [localhost:8081](http://localhost:8081)
 
 Prerequisites:
 
-* PostgreSQL 10
-* Python 3.7
+* PostgreSQL 11
+* Python 3.9
 
 ### Installing Python requirements
 

children/__init__.py

@@ -1 +0,0 @@
-default_app_config = "children.apps.ChildrenConfig"

children/admin.py

@@ -1,9 +1,9 @@
 from django.contrib import admin
-from django.utils.translation import ugettext_lazy as _
-from languages.models import Language
-from subscriptions.models import FreeSpotNotificationSubscription
+from django.utils.translation import gettext_lazy as _
 
 from events.models import Enrolment, TicketSystemPassword
+from languages.models import Language
+from subscriptions.models import FreeSpotNotificationSubscription
 
 from .models import Child, Relationship
 

children/apps.py

@@ -1,5 +1,5 @@
 from django.apps import AppConfig
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class ChildrenConfig(AppConfig):

children/factories.py

@@ -1,7 +1,7 @@
 import factory
-from projects.models import Project
 
 from children.models import Child, Relationship
+from projects.models import Project
 from users.factories import GuardianFactory
 
 

children/models.py

@@ -1,10 +1,10 @@
 from django.core.validators import RegexValidator
 from django.db import models, transaction
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
-from languages.models import Language
+from django.utils.translation import gettext_lazy as _
 
 from common.models import TimestampedModel, UUIDPrimaryKeyModel
+from languages.models import Language
 from users.models import Guardian
 
 
@@ -38,7 +38,9 @@ class Child(UUIDPrimaryKeyModel, TimestampedModel):
     last_name = models.CharField(verbose_name=_("last name"), max_length=64, blank=True)
     birthdate = models.DateField(verbose_name=_("birthdate"))
     postal_code = models.CharField(
-        verbose_name=_("postal code"), max_length=5, validators=[postal_code_validator],
+        verbose_name=_("postal code"),
+        max_length=5,
+        validators=[postal_code_validator],
     )
     guardians = models.ManyToManyField(
         Guardian,

children/notifications.py

@@ -1,8 +1,8 @@
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django_ilmoitin.dummy_context import dummy_context
 from django_ilmoitin.registry import notifications
-from projects.factories import ProjectFactory
 
+from projects.factories import ProjectFactory
 from users.factories import GuardianFactory
 
 from .factories import ChildWithGuardianFactory