devilry 6.6.0__tar.gz → 6.6.2__tar.gz

{devilry-6.6.0 → devilry-6.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devilry
-Version: 6.6.0
+Version: 6.6.2
 Summary: A system for handling electronic deliveries. See https://github.com/devilry/devilry-django.
 Author: Tor Johansen, Bendik Opstad, Vegard Angell, Magne Westlie, Ilya Kostolomov, Christian Tryti, Rebekka Mørken, Stian Julseth, Åsmund J. Rosendahl
 Author-email: Espen Angell Kristiansen <post@appresso.no>
@@ -86,6 +86,7 @@ Requires-Dist: model-bakery; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: pytest-django; extra == 'test'
 Requires-Dist: pytest-env; extra == 'test'
+Requires-Dist: pytest-xdist[psutil]; extra == 'test'
 Description-Content-Type: text/markdown
 
 # devilry
@@ -283,9 +284,20 @@ docker compose down -v
 
 https://devilry.readthedocs.io
 
+## Pre-release
+
+To ensure a clean commit, do the following:
+- Create a PR on GitHub from the working branch
+- Select `Squash and Merge` and update the commit-message, we use Conventional Commits to set the version later on, so start the commit with the proper keywords (i.e `feat`, `fix`, etc): https://www.conventionalcommits.org/en/v1.0.0/#specification
+- Once the PR is merged into master you can continue with the release.
+
+
+Before releasing, you should create a PR on GitHub and squash-merge it into master. Ensure the commit starts with 
+the compatible type for Conventional Commits (https://www.conventionalcommits.org/en/v1.0.0/#specification) (i.e `feat`, `fix`, etc)
+
 ## Release
 
-### Translations
+### Step 1: Translations
 
 To translate new texts, do the following:
 
@@ -295,7 +307,7 @@ To translate new texts, do the following:
 - Commit the changes
 
 
-### Update docs
+### Step 2: Update docs (for official readthedocs)
 Create a ``not_for_deploy/docs/sysadmin/migrationguides/migrate-to-<NEWVERSION>.rst``
 with update instructions for sysadmins. See the previous version for example. Skeleton:
 
@@ -349,7 +361,7 @@ Updates/changes
 ```
 
 
-### Set version and build staticfiles
+### Step 3: Set version and build staticfiles
 
 First make sure you have NO UNCOMITTED CHANGES!
 
@@ -374,7 +386,7 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
 ```
 
 
-### NOTE (release):
+#### NOTE (release):
 
 - `cz bump` automatically updates CHANGELOG.md, updates version file(s), commits the change and tags the release commit.
 - If you are unsure about what `cz bump` will do, run it with `--dry-run`. You can use
@@ -389,16 +401,12 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
   commit.
 - The `cz` command comes from `commitizen` (install documented above).
 
-### What if the release fails?
+#### What if the release fails?
 
 See _How to revert a bump_ in the [commitizen FAQ](https://commitizen-tools.github.io/commitizen/faq/#how-to-revert-a-bump).
 
 
-### Migrationguide and changelog (for official readthedocs)
-- Add a migration guide to not_for_deploy/docs/sysadmin/migrationguides/
-- Add a changelog to not_for_deploy/docs/user/changelog/
-
-### Release to pypi:
+### Step 4: Release to pypi
 
 ```bash
 hatch build -t sdist

{devilry-6.6.0 → devilry-6.6.2}/README.md

@@ -193,9 +193,20 @@ docker compose down -v
 
 https://devilry.readthedocs.io
 
+## Pre-release
+
+To ensure a clean commit, do the following:
+- Create a PR on GitHub from the working branch
+- Select `Squash and Merge` and update the commit-message, we use Conventional Commits to set the version later on, so start the commit with the proper keywords (i.e `feat`, `fix`, etc): https://www.conventionalcommits.org/en/v1.0.0/#specification
+- Once the PR is merged into master you can continue with the release.
+
+
+Before releasing, you should create a PR on GitHub and squash-merge it into master. Ensure the commit starts with 
+the compatible type for Conventional Commits (https://www.conventionalcommits.org/en/v1.0.0/#specification) (i.e `feat`, `fix`, etc)
+
 ## Release
 
-### Translations
+### Step 1: Translations
 
 To translate new texts, do the following:
 
@@ -205,7 +216,7 @@ To translate new texts, do the following:
 - Commit the changes
 
 
-### Update docs
+### Step 2: Update docs (for official readthedocs)
 Create a ``not_for_deploy/docs/sysadmin/migrationguides/migrate-to-<NEWVERSION>.rst``
 with update instructions for sysadmins. See the previous version for example. Skeleton:
 
@@ -259,7 +270,7 @@ Updates/changes
 ```
 
 
-### Set version and build staticfiles
+### Step 3: Set version and build staticfiles
 
 First make sure you have NO UNCOMITTED CHANGES!
 
@@ -284,7 +295,7 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
 ```
 
 
-### NOTE (release):
+#### NOTE (release):
 
 - `cz bump` automatically updates CHANGELOG.md, updates version file(s), commits the change and tags the release commit.
 - If you are unsure about what `cz bump` will do, run it with `--dry-run`. You can use
@@ -299,16 +310,12 @@ tools/release/prepare-release.py prepare --prerelease rc --apply
   commit.
 - The `cz` command comes from `commitizen` (install documented above).
 
-### What if the release fails?
+#### What if the release fails?
 
 See _How to revert a bump_ in the [commitizen FAQ](https://commitizen-tools.github.io/commitizen/faq/#how-to-revert-a-bump).
 
 
-### Migrationguide and changelog (for official readthedocs)
-- Add a migration guide to not_for_deploy/docs/sysadmin/migrationguides/
-- Add a changelog to not_for_deploy/docs/user/changelog/
-
-### Release to pypi:
+### Step 4: Release to pypi
 
 ```bash
 hatch build -t sdist

devilry-6.6.2/devilry/__init__.py

@@ -0,0 +1 @@
+__version__ = "6.6.2"

{devilry-6.6.0 → devilry-6.6.2}/devilry/devilry_admin/views/assignment/examiners/overview.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 
 
-from django.http import Http404
-from django.utils.translation import gettext_lazy
 from cradmin_legacy import crapp
 from cradmin_legacy.crinstance import reverse_cradmin_url
 from cradmin_legacy.viewhelpers.listbuilder.itemframe import DefaultSpacingItemFrame
 from cradmin_legacy.viewhelpers.listbuilder.lists import RowList
+from django.http import Http404
+from django.utils.translation import gettext_lazy
 
-from devilry.apps.core.models import RelatedExaminer, AssignmentGroup
+from devilry.apps.core.models import AssignmentGroup, RelatedExaminer
 from devilry.devilry_admin.cradminextensions.listbuilder import listbuilder_relatedexaminer
 from devilry.devilry_cradmin import devilry_listbuilder
 from devilry.devilry_cradmin.devilry_listfilter.utils import WithResultValueRenderable
@@ -84,16 +84,16 @@ class Overview(listbuilder_relatedexaminer.ListViewBase):
     def get_unfiltered_queryset_for_role(self, role):
         assignment = role
         period = assignment.period
+        all_queryset = RelatedExaminer.objects.filter(period=period, active=True)
+
         queryset = (
-            RelatedExaminer.objects.filter(period=period)
-            .select_related("user")
+            all_queryset.select_related("user")
             .annotate_with_number_of_groups_on_assignment(assignment=assignment)
             .extra_annotate_with_number_of_candidates_on_assignment(assignment=assignment)
-            .exclude(active=False)
         )
 
         # Set unfiltered count on self.
-        self.num_total = queryset.count()
+        self.num_total = all_queryset.count()
         return queryset
 
     def get_queryset_for_role(self, role):

devilry-6.6.2/devilry/devilry_qualifiesforexam/migrations/0008_auto_20260429_1435.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.2.13 on 2026-04-29 12:35
+
+from django.db import migrations
+
+PLUGIN = "devilry_qualifiesforexam_plugin_approved.plugin_select_assignments"
+
+
+def convert_plugin_data_list_to_dict(apps, _schema_editor):
+    Status = apps.get_model("devilry_qualifiesforexam", "Status")
+    statuses = Status.objects.filter(plugin=PLUGIN)
+    for status in statuses:
+        if isinstance(status.plugin_data, list):
+            status.plugin_data = {"qualifying_assignment_ids": status.plugin_data}
+            status.save(update_fields=["plugin_data"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('devilry_qualifiesforexam', '0007_draftstatus_draftqualifiesforfinalexam'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            convert_plugin_data_list_to_dict,
+            migrations.RunPython.noop,
+        ),
+    ]

devilry-6.6.2/devilry/devilry_qualifiesforexam/migrations/0009_auto_20260504_1358.py

@@ -0,0 +1,36 @@
+# Generated by Django 5.2.13 on 2026-05-04 11:58
+
+from django.db import migrations
+import json
+
+PLUGIN = "devilry_qualifiesforexam_plugin_approved.plugin_select_assignments"
+
+def convert_plugin_data_json_stringlist_to_dict(apps, _schema_editor):
+    """
+    This migration fixes an issue that originated from the the Status.plugin_data JSONField being introduced.
+
+    The issue is that some Status records have plugin_data stored as a JSON string of a list of integers, instead of a 
+    dict with the key "qualifying_assignment_ids" mapping to the list of integers.
+    """
+    Status = apps.get_model("devilry_qualifiesforexam", "Status")
+    statuses = Status.objects.filter(plugin=PLUGIN)
+    for status in statuses:
+        if isinstance(status.plugin_data, str):
+            try:
+                json_data = json.loads(status.plugin_data)
+                if isinstance(json_data, list) and all(isinstance(item, int) for item in json_data):
+                    status.plugin_data = {"qualifying_assignment_ids": json_data}
+                    status.save(update_fields=["plugin_data"])
+            except Exception:
+                pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('devilry_qualifiesforexam', '0008_auto_20260429_1435'),
+    ]
+
+    operations = [
+        migrations.RunPython(convert_plugin_data_json_stringlist_to_dict),
+    ]

{devilry-6.6.0 → devilry-6.6.2}/pyproject.toml

@@ -81,6 +81,7 @@ test = [
     "pytest",
     "pytest-django",
     "pytest-env",
+    "pytest-xdist[psutil]",
     "model-bakery",
     "coverage",
 ]
@@ -104,7 +105,7 @@ exclude = [
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "6.6.0"
+version = "6.6.2"
 version_files = ["devilry/__init__.py:__version__"]
 tag_format = "$version"
 update_changelog_on_bump = true

devilry-6.6.0/devilry/__init__.py

@@ -1 +0,0 @@
-__version__ = "6.6.0"