Skip to content

Sasdata database redux - #213

Merged
krzywon merged 967 commits into
refactor_24from
sasdata-database-merged
Jul 27, 2026
Merged

Sasdata database redux#213
krzywon merged 967 commits into
refactor_24from
sasdata-database-merged

Conversation

@krzywon

@krzywon krzywon commented Jun 3, 2026

Copy link
Copy Markdown
Collaborator

This is a recreation of the work done by @summerhenson in #106. The rebase and force-push commits into that branch caused issues that weren't easily recoverable. This now is the ground truth of the original PR, and all of the original changes are included without the massive changes to the base refactor_24 branch.

Sequence of operations to arrive here:

  • Create a branch off a commit just prior to the start of the database work (exact one will be linked to once I remember which one)
  • Cherry-pick each commit made by @summerhenson in the original PR into this branch
  • Merge refactor_24 into this branch, resolve conflicts, and resolve ruff issues
  • Merge refactor_24 into this branch and resolve conflicts again, which brought the status closer to the PR changes
  • Open this PR.
  • Fix merge-related issues
  • Find the missing changes from the original PR to this one and commit them separately.

@krzywon
krzywon marked this pull request as ready for review June 4, 2026 13:49
@krzywon krzywon mentioned this pull request Jun 16, 2026
@krzywon

krzywon commented Jul 24, 2026

Copy link
Copy Markdown
Collaborator Author

Failing unit tests after a merge... I'll fix these shortly.

@codescene-delta-analysis codescene-delta-analysis Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

No quality gates enabled for this code.

See analysis details in CodeScene

Quality Gate Profile: Custom Configuration
Install CodeScene MCP: safeguard and uplift AI-generated code. Catch issues early with our IDE extension and CLI tool.

@krzywon

krzywon commented Jul 27, 2026

Copy link
Copy Markdown
Collaborator Author

The unit tests failing here are already failing in the refactor branch. The new, django-based tests all pass here. I think this is ready to merge.

@DrPaulSharp

Copy link
Copy Markdown
Contributor

The failed tests are also fixed in #220 (I can put a small PR in if there's a need to sort them sooner), so I'm happy to merge too.

@krzywon
krzywon merged commit f8cefbc into refactor_24 Jul 27, 2026
11 of 17 checks passed
@krzywon
krzywon deleted the sasdata-database-merged branch July 27, 2026 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants