Merge branch 'prepare-release-2.0rc2' into 'release/2.0'

Prepare release 2.0rc2

See merge request !54

CHANGELOG.rst

@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
+`2.0rc2`_ - 2021-07-23
+----------------------
+
+Fixed
+~~~~~
+
+* Drop usage of no longer existing method ``get_subject_by_short_name``.
+
 `2.0rc1`_ - 2021-06-23
 ----------------------
 
@@ -74,3 +82,5 @@ Fixed
 .. _1.0a2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-CSVImport/-/tags/1.0a2
 .. _2.0b0: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-CSVImport/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-CSVImport/-/tags/2.0b1
+.. _2.0rc1: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-CSVImport/-/tags/2.0rc1
+.. _2.0rc2: https://edugit.org/Teckids/AlekSIS/AlekSIS-App-CSVImport/-/tags/2.0rc2

aleksis/apps/csv_import/field_types.py

@@ -325,9 +325,12 @@ class GroupSubjectByShortNameFieldType(ProcessFieldType):
     models = [Group]
 
     def process(self, instance: Model, value):
-        subject = get_subject_by_short_name(value)
-        instance.subject = subject
-        instance.save()
+        with_chronos = apps.is_installed("aleksis.apps.chronos")
+        if with_chronos:
+            Subject = apps.get_model("chronos", "Subject")
+            subject, __ = Subject.objects.get_or_create(short_name=value, defaults={"name": value})
+            instance.subject = subject
+            instance.save()
 
 
 @field_type_registry.register

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-CSVImport"
-version = "2.0rc1"
+version = "2.0rc2"
 packages = [
     { include = "aleksis" }
 ]