Backport: 918fbf5 (PR #6971), dd3b28e (#6976, PR #6977)

[dsotirho-ucsc]

Checklist

Author

• Target branch is develop
• Name of PR branch matches backports/<7-digit SHA1 of most recent backported commit>
• PR title contains the 7-digit SHA1 of the backported commits
• PR title references the issues relating to the backported commits
• PR title references the PRs that introduced the backported commits

Author (before every review)

• Merged develop into PR branch to integrate upstream changes
• Ran make requirements_update _{or this PR does not modify requirements*.txt, common.mk, Makefile and Dockerfile}
• Added R tag to commit title _{or this PR does not modify requirements*.txt}
• This PR is labeled reqs _{or does not modify requirements*.txt}

System administrator (after approval)

• Actually approved the PR
• Decided if PR can be labeled no sandbox
• PR title is appropriate as title of merge commit
• Moved connected issue to Approved column
• PR is assigned to only the operator

Operator (before pushing merge the commit)

• Sanity-checked history
• Pushed PR branch to GitHub
• Added sandbox label _{or PR is labeled no sandbox}
• Pushed PR branch to GitLab dev _{or PR is labeled no sandbox}
• Pushed PR branch to GitLab anvildev _{or PR is labeled no sandbox}
• Build passes in sandbox deployment _{or PR is labeled no sandbox}
• Build passes in anvilbox deployment _{or PR is labeled no sandbox}
• Reviewed build logs for anomalies in sandbox deployment _{or PR is labeled no sandbox}
• Reviewed build logs for anomalies in anvilbox deployment _{or PR is labeled no sandbox}
• The title of the merge commit starts with the title of this PR
• Added PR # reference (to this PR) to merge commit title
• Collected commit title tags in merge commit title _{but excluded any p tags}
• Pushed merge commit to GitHub

Operator (after pushing the merge commit)

• Pushed merge commit to GitLab dev
• Pushed merge commit to GitLab anvildev
• Build passes on GitLab dev
• Reviewed build logs for anomalies on GitLab dev
• Build passes on GitLab anvildev
• Reviewed build logs for anomalies on GitLab anvildev
• Deleted PR branch from GitHub
• Deleted PR branch from GitLab dev
• Deleted PR branch from GitLab anvildev

Operator

• PR is assigned to no one

Shorthand for review comments

• L line is too long
• W line wrapping is wrong
• Q bad quotes
• F other formatting problem

[coveralls]

coverage: 85.683%. remained the same
when pulling be87de3 on backports/918fbf5
into f7c3bee on develop.

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 85.63%. Comparing base (f7c3bee) to head (be87de3).
Report is 11 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop    #6974   +/-   ##
========================================
  Coverage    85.63%   85.63%           
========================================
  Files          151      151           
  Lines        21658    21658           
========================================
  Hits         18546    18546           
  Misses        3112     3112           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[hannes-ucsc]

Let's add the changes from #6977. You don't need to change the branch name.

[dsotirho-ucsc]

This backport PR now contains 918fbf5 (anvilprod snapshot removed due to AccessDenied) and dd3b28e (anvilprod snapshot removed due to || joiner)

[hannes-ucsc]

See CL.