Merge branch 'master' into 137-fields-must-be-unique-per-site

aleksis/apps/chronos/migrations/0007_more_permissions.py

+# Generated by Django 3.2.3 on 2021-05-21 18:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chronos', '0006_indexes'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='chronosglobalpermissions',
+            options={'managed': False, 'permissions': (('view_all_room_timetables', 'Can view all room timetables'), ('view_all_group_timetables', 'Can view all group timetables'), ('view_all_person_timetables', 'Can view all person timetables'), ('view_timetable_overview', 'Can view timetable overview'), ('view_lessons_day', 'Can view all lessons per day'))},
+        ),
+    ]

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Chronos"
-version = "2.0a5.dev0"
+version = "2.0b0"
 packages = [
     { include = "aleksis" }
 ]
@@ -8,15 +8,26 @@ readme = "README.rst"
 include = ["CHANGELOG.rst", "LICENCE.rst", "aleksis/**/locale/*.mo"]
 
 description = "AlekSIS (School Information System) — App Χρόνος (digital timetables)"
-authors = ["Dominik George <dominik.george@teckids.org>", "Julian Leucker <leuckeju@katharineum.de>", "Frank Poetzsch-Heffter <p-h@katharineum.de>", "Tom Teichler <tom.teichler@teckids.org>", "Jonathan Weth <wethjo@katharineum.de>", "Hangzhi Yu <yuha@katharineum.de>"]
-maintainers = ["Jonathan Weth <wethjo@katharineum.de>", "Dominik George <dominik.george@teckids.org>"]
+authors = [
+    "Dominik George <dominik.george@teckids.org>",
+    "Julian Leucker <leuckeju@katharineum.de>",
+    "Frank Poetzsch-Heffter <p-h@katharineum.de>",
+    "Tom Teichler <tom.teichler@teckids.org>",
+    "Jonathan Weth <wethjo@katharineum.de>",
+    "Hangzhi Yu <yuha@katharineum.de>",
+    "Lloyd Meins <meinsll@katharineum.de>"
+]
+maintainers = [
+    "Jonathan Weth <wethjo@katharineum.de>",
+    "Dominik George <dominik.george@teckids.org>"
+]
 license = "EUPL-1.2-or-later"
 homepage = "https://aleksis.org/"
 repository = "https://edugit.org/AlekSIS/official/AlekSIS-App-Chronos"
 documentation = "https://aleksis.org/AlekSIS/docs/html/"
 keywords = ["SIS", "education", "school", "timetable", "plans"]
 classifiers = [
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Environment :: Web Environment",
     "Framework :: Django :: 3.0",
     "Intended Audience :: Education",
@@ -30,9 +41,9 @@ url = "https://edugit.org/api/v4/projects/461/packages/pypi/simple"
 secondary = true
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.9"
 calendarweek = "^0.5.0"
-aleksis-core = "^2.0a5.dev0"
+aleksis-core = "^2.0b0"
 
 [tool.poetry.dev-dependencies]
 aleksis-builddeps = "*"