Skip to content

Fix setup#3233

Merged
rtibbles merged 2 commits intolearningequality:unstablefrom
rtibbles:fix_setup
Jul 9, 2021
Merged

Fix setup#3233
rtibbles merged 2 commits intolearningequality:unstablefrom
rtibbles:fix_setup

Conversation

@rtibbles
Copy link
Copy Markdown
Member

@rtibbles rtibbles commented Jul 8, 2021

Summary

Description of the change(s) you made

Setup does not run since the Django 3.2 upgrade
Tighter SQLite foreign key constraints made this issue surface
Fixes this by handling integrity errors in setting prerequisite relationships and by not setting root nodes as incomplete in the mark_incomplete command.

Should at least provide more diagnostic errors for #3234 if it does not fix it

Manual verification steps performed

  1. Ran ./contentcuration/manage.py setup it did not break!

Contributor's Checklist

PR process:

  • If this is an important user-facing change, PR or related issue the CHANGELOG label been added to this PR. Note: items with this label will be added to the CHANGELOG at a later time
  • If this includes an internal dependency change, a link to the diff is provided
  • The docs label has been added if this introduces a change that needs to be updated in the user docs?
  • If any Python requirements have changed, the updated requirements.txt files also included in this PR
  • Opportunities for using Google Analytics here are noted
  • Migrations are safe for a large db

Studio-specifc:

  • All user-facing strings are translated properly
  • The notranslate class been added to elements that shouldn't be translated by Google Chrome's automatic translation feature (e.g. icons, user-generated text)
  • All UI components are LTR and RTL compliant
  • Views are organized into pages, components, and layouts directories as described in the docs
  • Users' storage used is recalculated properly on any changes to main tree files
  • If there new ways this uses user data that needs to be factored into our Privacy Policy, it has been noted.

Testing:

  • Code is clean and well-commented
  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Any new interactions have been added to the QA Sheet
  • Critical and brittle code paths are covered by unit tests

Reviewer's Checklist

This section is for reviewers to fill out.

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

rtibbles added 2 commits July 8, 2021 13:51
Catch integrity error to handle both sides of missing prerequisite relationships.
@rtibbles rtibbles requested a review from sairina July 8, 2021 20:54
Copy link
Copy Markdown
Contributor

@sairina sairina left a comment

Choose a reason for hiding this comment

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

lgtm! Everything seems to be fixed. Thank you!

@rtibbles rtibbles merged commit 4bdda0f into learningequality:unstable Jul 9, 2021
@rtibbles rtibbles deleted the fix_setup branch July 9, 2021 14:21


def map_content_nodes(
def map_content_nodes( # noqa: C901
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Ah that's how to do it with a multi-line arguments list

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

It took me a couple of tries...

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