Merge branch 'develop' into 'master'

Develop to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!85

kaehmy/models.py

@@ -13,6 +13,7 @@ class BaseRole(models.Model):
     is_board = models.BooleanField(_("Board member"))
 
     CATEGORIES = (
+        ("board", _("Board")),
         ("corporate", _("Corporate affairs")),
         ("freshman", _("Freshmen")),
         ("international", _("International")),
@@ -25,6 +26,7 @@ class BaseRole(models.Model):
         ("studies", _("Studies")),
         ("sosso", _("Sössö magazine")),
         ("alumni", _("Alumni relations")),
+        ("n", _("N")),
         ("others", _("Others")),
     )
     category = models.CharField(

poetry.lock

@@ -241,14 +241,14 @@ Django = ">=3.2"
 
 [[package]]
 name = "django-phonenumber-field"
-version = "6.3.0"
+version = "6.4.0"
 description = "An international phone number field for django models."
 category = "main"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
-Django = ">=2.2"
+Django = ">=3.2"
 phonenumbers = {version = ">=7.0.2", optional = true, markers = "extra == \"phonenumbers\""}
 
 [package.extras]
@@ -314,7 +314,7 @@ test = ["cryptography", "pytest-cov", "pytest-django", "pytest-xdist", "pytest",
 
 [[package]]
 name = "dparse"
-version = "0.5.1"
+version = "0.6.2"
 description = "A parser for Python dependency files"
 category = "dev"
 optional = false
@@ -322,11 +322,11 @@ python-versions = ">=3.5"
 
 [package.dependencies]
 packaging = "*"
-pyyaml = "*"
 toml = "*"
 
 [package.extras]
 pipenv = ["pipenv"]
+conda = ["pyyaml"]
 
 [[package]]
 name = "et-xmlfile"
@@ -1093,10 +1093,7 @@ djangorestframework-simplejwt = [
     {file = "djangorestframework_simplejwt-5.2.0-py3-none-any.whl", hash = "sha256:bcc4cb74dcb637ca1e17eed35276bd618ab19491f8c53e65dee6271177c355e8"},
     {file = "djangorestframework_simplejwt-5.2.0.tar.gz", hash = "sha256:a60b09afb27d91ad1d7ac904cc632bd52cecead8f389f0fa1532ceb0fb757a74"},
 ]
-dparse = [
+dparse = []
-    {file = "dparse-0.5.1-py3-none-any.whl", hash = "sha256:e953a25e44ebb60a5c6efc2add4420c177f1d8404509da88da9729202f306994"},
-    {file = "dparse-0.5.1.tar.gz", hash = "sha256:a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"},
-]
 et-xmlfile = [
     {file = "et_xmlfile-1.1.0-py3-none-any.whl", hash = "sha256:a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada"},
     {file = "et_xmlfile-1.1.0.tar.gz", hash = "sha256:8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c"},