Skip to content

Merge release-v0.8.x into release-v0.9.x#323

Merged
bjester merged 6 commits intolearningequality:release-v0.9.xfrom
bjester:merge-des-exc
Apr 29, 2026
Merged

Merge release-v0.8.x into release-v0.9.x#323
bjester merged 6 commits intolearningequality:release-v0.9.xfrom
bjester:merge-des-exc

Conversation

@bjester
Copy link
Copy Markdown
Member

@bjester bjester commented Apr 29, 2026 •
edited
Loading

Summary

Corrected merge conflicts and re-ran prek formatting on all files.

	both modified:   morango/__init__.py
	both modified:   morango/models/core.py
	both modified:   morango/sync/operations.py
	both modified:   morango/utils.py
	both modified:   tests/testapp/tests/helpers.py
	deleted by them: tests/testapp/tests/test_migrations.py
	both modified:   tests/testapp/tests/test_utils.py

ozer550 and others added 6 commits April 9, 2026 08:55
@ozer550 @bjester
Fix silent deserialization failure with unique together constraint (l…
5a9e53d 
…earningequality#313)

* add regression tests to verify unique-constraint setup fails silently

* converge per record save logic for both self-referential and non self-referential branch

* Bump version

---------

Co-authored-by: Blaine Jester <blainesworld@gmail.com>
@bjester
Add deserialization_exception field for programmatic error handling
6c76551
@bjester
Removed tests that have served their purpose and are causing problems
10b3019
@bjester
Bump version and add changelog notes
75c1f8c
@bjester
Merge pull request learningequality#316 from bjester/des-exc
398fc95 
Add deserialization_exception field for programmatic error handling
@bjester
Resolve merge conflicts
dcd1283
rtibbles
rtibbles approved these changes Apr 29, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No concerns from reviewing the conflicted files!

@bjester bjester merged commit 1ff771e into learningequality:release-v0.9.x Apr 29, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rtibbles rtibbles rtibbles approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bjester @rtibbles @ozer550