Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add relations to PFB-based verbatim manifest for AnVIL (#6066) #6815

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from

Conversation

nadove-ucsc
Copy link
Contributor

@nadove-ucsc nadove-ucsc commented Jan 10, 2025

Connected issues: #6066

Checklist

Author

  • PR is a draft
  • Target branch is develop
  • Name of PR branch matches issues/<GitHub handle of author>/<issue#>-<slug>
  • On ZenHub, PR is connected to all issues it (partially) resolves
  • PR description links to connected issues
  • PR title matches1 that of a connected issue or comment in PR explains why they're different
  • PR title references all connected issues
  • For each connected issue, there is at least one commit whose title references that issue

1 when the issue title describes a problem, the corresponding PR
title is Fix: followed by the issue title

Author (partiality)

  • Added p tag to titles of partial commits
  • This PR is labeled partial or completely resolves all connected issues
  • This PR partially resolves each of the connected issues or does not have the partial label

Author (chains)

  • This PR is blocked by previous PR in the chain or is not chained to another PR
  • The blocking PR is labeled base or this PR is not chained to another PR
  • This PR is labeled chained or is not chained to another PR

Author (reindex, API changes)

  • Added r tag to commit title or the changes introduced by this PR will not require reindexing of any deployment
  • This PR is labeled reindex:dev or the changes introduced by it will not require reindexing of dev
  • This PR is labeled reindex:anvildev or the changes introduced by it will not require reindexing of anvildev
  • This PR is labeled reindex:anvilprod or the changes introduced by it will not require reindexing of anvilprod
  • This PR is labeled reindex:prod or the changes introduced by it will not require reindexing of prod
  • This PR is labeled reindex:partial and its description documents the specific reindexing procedure for dev, anvildev, anvilprod and prod or requires a full reindex or carries none of the labels reindex:dev, reindex:anvildev, reindex:anvilprod and reindex:prod
  • This PR and its connected issues are labeled API or this PR does not modify a REST API
  • Added a (A) tag to commit title for backwards (in)compatible changes or this PR does not modify a REST API
  • Updated REST API version number in app.py or this PR does not modify a REST API

Author (upgrading deployments)

  • Ran make docker_images.json and committed the resulting changes or this PR does not modify azul_docker_images, or any other variables referenced in the definition of that variable
  • Documented upgrading of deployments in UPGRADING.rst or this PR does not require upgrading deployments
  • Added u tag to commit title or this PR does not require upgrading deployments
  • This PR is labeled upgrade or does not require upgrading deployments
  • This PR is labeled deploy:shared or does not modify docker_images.json, and does not require deploying the shared component for any other reason
  • This PR is labeled deploy:gitlab or does not require deploying the gitlab component
  • This PR is labeled deploy:runner or does not require deploying the runner image

Author (hotfixes)

  • Added F tag to main commit title or this PR does not include permanent fix for a temporary hotfix
  • Reverted the temporary hotfixes for any connected issues or the none of the stable branches (anvilprod and prod) have temporary hotfixes for any of the issues connected to this PR

Author (before every review)

  • Rebased PR branch on develop, squashed old fixups
  • 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
  • make integration_test passes in personal deployment or this PR does not modify functionality that could affect the IT outcome

Peer reviewer (after approval)

  • PR is not a draft
  • Ticket is in Review requested column
  • PR is awaiting requested review from system administrator
  • PR is assigned to only the system administrator

System administrator (after approval)

  • Actually approved the PR
  • Labeled connected issues as demo or no demo
  • Commented on connected issues about demo expectations or all connected issues are labeled no demo
  • Decided if PR can be labeled no sandbox
  • A comment to this PR details the completed security design review
  • PR title is appropriate as title of merge commit
  • N reviews label is accurate
  • Moved connected issues to Approved column
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Checked reindex:… labels and r commit title tag
  • Checked that demo expectations are clear or all connected issues are labeled no demo
  • Squashed PR branch and rebased onto develop
  • Sanity-checked history
  • Pushed PR branch to GitHub
  • Ran _select dev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select dev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Ran _select anvildev.shared && CI_COMMIT_REF_NAME=develop make -C terraform/shared apply_keep_unused or this PR is not labeled deploy:shared
  • Ran _select anvildev.gitlab && CI_COMMIT_REF_NAME=develop make -C terraform/gitlab apply or this PR is not labeled deploy:gitlab
  • Checked the items in the next section or this PR is labeled deploy:gitlab
  • PR is assigned to only the system administrator or this PR is not labeled deploy:gitlab

System administrator

  • Background migrations for dev.gitlab are complete or this PR is not labeled deploy:gitlab
  • Background migrations for anvildev.gitlab are complete or this PR is not labeled deploy:gitlab
  • PR is assigned to only the operator

Operator (before pushing merge the commit)

  • Ran _select dev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • Ran _select anvildev.gitlab && make -C terraform/gitlab/runner or this PR is not labeled deploy:runner
  • 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
  • Deleted unreferenced indices in sandbox or this PR does not remove catalogs or otherwise causes unreferenced indices in dev
  • Deleted unreferenced indices in anvilbox or this PR does not remove catalogs or otherwise causes unreferenced indices in anvildev
  • Started reindex in sandbox or this PR is not labeled reindex:dev
  • Started reindex in anvilbox or this PR is not labeled reindex:anvildev
  • Checked for failures in sandbox or this PR is not labeled reindex:dev
  • Checked for failures in anvilbox or this PR is not labeled reindex:anvildev
  • The title of the merge commit starts with the title of this PR
  • Added PR # reference to merge commit title
  • Collected commit title tags in merge commit title but only included p if the PR is also labeled partial
  • Moved connected issues to Merged lower column in ZenHub
  • Moved blocked issues to Triage or no issues are blocked on the connected issues
  • Pushed merge commit to GitHub

Operator (chain shortening)

  • Changed the target branch of the blocked PR to develop or this PR is not labeled base
  • Removed the chained label from the blocked PR or this PR is not labeled base
  • Removed the blocking relationship from the blocked PR or this PR is not labeled base
  • Removed the base label from this PR or this PR is not labeled base

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
  • Ran _select dev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Ran _select anvildev.shared && make -C terraform/shared apply or this PR is not labeled deploy:shared
  • Deleted PR branch from GitHub
  • Deleted PR branch from GitLab dev
  • Deleted PR branch from GitLab anvildev

Operator (reindex)

  • Deindexed all unreferenced catalogs in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed all unreferenced catalogs in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Deindexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Deindexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Indexed specific sources in dev or this PR is neither labeled reindex:partial nor reindex:dev
  • Indexed specific sources in anvildev or this PR is neither labeled reindex:partial nor reindex:anvildev
  • Started reindex in dev or this PR does not require reindexing dev
  • Started reindex in anvildev or this PR does not require reindexing anvildev
  • Checked for, triaged and possibly requeued messages in both fail queues in dev or this PR does not require reindexing dev
  • Checked for, triaged and possibly requeued messages in both fail queues in anvildev or this PR does not require reindexing anvildev
  • Emptied fail queues in dev or this PR does not require reindexing dev
  • Emptied fail queues in anvildev or this PR does not require reindexing anvildev
  • Restarted the trigger_child job in the most recent Data Browser build for the ucsc/hca/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted the trigger_child job in the most recent Data Browser build for the ucsc/lungmap/dev branch on GitLab in dev or this PR does not require reindexing dev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in dev or this PR does not require reindexing dev
  • Restarted the trigger_child job in the most recent Data Browser build for the ucsc/anvil/anvildev branch on GitLab in anvildev or this PR does not require reindexing anvildev
  • Restarted deploy_browser job in the GitLab pipeline for this PR in anvildev or this PR does not require reindexing anvildev

Operator

  • Propagated the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels to the next promotion PRs or this PR carries none of these labels
  • Propagated any specific instructions related to the deploy:shared, deploy:gitlab, deploy:runner, API, reindex:partial, reindex:anvilprod and reindex:prod labels, from the description of this PR to that of the next promotion PRs or this PR carries none of these labels
  • 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

@github-actions github-actions bot added the orange [process] Done by the Azul team label Jan 10, 2025
@coveralls
Copy link

coveralls commented Jan 10, 2025

Coverage Status

coverage: 85.576% (+0.01%) from 85.563%
when pulling fc9337b on issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil
into 033d2ff on develop.

@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 17dcedc to 94f2568 Compare January 10, 2025 02:46
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 6f5e8b9 to 44ae20b Compare January 10, 2025 07:13
Copy link

codecov bot commented Jan 10, 2025

Codecov Report

Attention: Patch coverage is 83.67347% with 8 lines in your changes missing coverage. Please review.

Project coverage is 85.53%. Comparing base (033d2ff) to head (fc9337b).

Files with missing lines Patch % Lines
test/integration_test.py 0.00% 8 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #6815      +/-   ##
===========================================
- Coverage    85.54%   85.53%   -0.01%     
===========================================
  Files          147      147              
  Lines        21074    21113      +39     
===========================================
+ Hits         18028    18060      +32     
- Misses        3046     3053       +7     

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

@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 1ac5c98 to 58c931c Compare January 10, 2025 08:46
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch 5 times, most recently from bdcc115 to cdc5640 Compare January 22, 2025 09:08
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from cdc5640 to ed65a04 Compare January 24, 2025 01:40
@nadove-ucsc nadove-ucsc added the chained [process] PR needs to based of develop before merging label Jan 24, 2025
@nadove-ucsc nadove-ucsc changed the base branch from develop to issues/nadove-ucsc/6139-improve-handling-duos-replicas January 24, 2025 01:41
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch 2 times, most recently from e4f0885 to de7251a Compare January 25, 2025 02:09
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6139-improve-handling-duos-replicas branch from 6c8b265 to 0456435 Compare January 29, 2025 00:00
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from c9b9a44 to 6b945b8 Compare January 29, 2025 00:57
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6139-improve-handling-duos-replicas branch from 8badd65 to c688659 Compare January 29, 2025 02:42
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 6b945b8 to 31e4aee Compare January 29, 2025 06:26
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6139-improve-handling-duos-replicas branch from 08f2229 to 3d82534 Compare January 30, 2025 01:02
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 31e4aee to 6439a73 Compare January 30, 2025 05:47
@dsotirho-ucsc dsotirho-ucsc force-pushed the issues/nadove-ucsc/6139-improve-handling-duos-replicas branch from 4ef58a1 to 38a7270 Compare January 30, 2025 21:11
@dsotirho-ucsc dsotirho-ucsc changed the base branch from issues/nadove-ucsc/6139-improve-handling-duos-replicas to develop January 30, 2025 22:46
@dsotirho-ucsc dsotirho-ucsc removed the chained [process] PR needs to based of develop before merging label Jan 30, 2025
Note that non-schema orphans still use `datarepo_row_id` since their primary key column is not defined by the schema
@nadove-ucsc nadove-ucsc force-pushed the issues/nadove-ucsc/6066-add-relations-verbatim-pfb-manifest-anvil branch from 6439a73 to 990aad1 Compare January 30, 2025 22:56
Copy link
Contributor

@dsotirho-ucsc dsotirho-ucsc left a comment

Choose a reason for hiding this comment

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

Approved.

@dsotirho-ucsc dsotirho-ucsc marked this pull request as ready for review February 1, 2025 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
orange [process] Done by the Azul team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants