Promotion 2024-09-10 anvilprod (#6555)

.github/PULL_REQUEST_TEMPLATE/anvilprod-hotfix.md

@@ -40,7 +40,7 @@ Connected issue: #0000
 - [ ] 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
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 

.github/PULL_REQUEST_TEMPLATE/anvilprod-promotion.md

@@ -37,7 +37,7 @@ Connected issue: #0000
 
 - [ ] Actually approved the PR
 - [ ] Decided if PR can be labeled `no sandbox`
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 

.github/PULL_REQUEST_TEMPLATE/backport.md

@@ -28,7 +28,7 @@ This is the PR template for backport PRs against `develop`.
 - [ ] Actually approved the PR
 - [ ] Decided if PR can be labeled `no sandbox`
 - [ ] PR title is appropriate as title of merge commit
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 

.github/PULL_REQUEST_TEMPLATE/prod-hotfix.md

@@ -40,7 +40,7 @@ Connected issue: #0000
 - [ ] Labeled PR as `no sandbox`
 - [ ] A comment to this PR details the completed security design review
 - [ ] PR title is appropriate as title of merge commit
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 

.github/PULL_REQUEST_TEMPLATE/prod-promotion.md

@@ -37,7 +37,7 @@ Connected issue: #0000
 
 - [ ] Actually approved the PR
 - [ ] Labeled PR as `no sandbox`
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 

.github/PULL_REQUEST_TEMPLATE/upgrade.md

@@ -44,7 +44,7 @@ Connected issue: #0000
 - [ ] Labeled connected issue as `no demo`
 - [ ] A comment to this PR details the completed security design review
 - [ ] PR title is appropriate as title of merge commit
-- [ ] Moved ticket to *Approved* column
+- [ ] Moved connected issue to *Approved* column
 - [ ] PR is assigned to only the operator
 
 
@@ -85,6 +85,7 @@ Connected issue: #0000
 - [ ] Added PR # reference to merge commit title
 - [ ] Collected commit title tags in merge commit title <sub>but excluded any `p` tags</sub>
 - [ ] Moved connected issue to *Merged lower* column in ZenHub
+- [ ] Moved blocked issues to *Triage* <sub>or no issues are blocked on the connected issue</sub>
 - [ ] Closed related Dependabot PRs with a comment referencing the corresponding commit in this PR <sub>or this PR does not include any such commits</sub>
 - [ ] Pushed merge commit to GitHub
 

.github/pull_request_template.md

@@ -97,7 +97,7 @@ title is `Fix: ` followed by the issue title
 - [ ] 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 ticket to *Approved* column
+- [ ] Moved connected issues to *Approved* column
 - [ ] PR is assigned to only the operator
 
 
@@ -144,6 +144,7 @@ title is `Fix: ` followed by the issue title
 - [ ] Added PR # reference to merge commit title
 - [ ] Collected commit title tags in merge commit title <sub>but only included `p` if the PR is also labeled `partial`</sub>
 - [ ] Moved connected issues to *Merged lower* column in ZenHub
+- [ ] Moved blocked issues to *Triage* <sub>or no issues are blocked on the connected issues</sub>
 - [ ] Pushed merge commit to GitHub
 
 

.github/pull_request_template.md.template.py

@@ -637,7 +637,7 @@ def emit(t: T, target_branch: str):
             }),
             {
                 'type': 'cli',
-                'content': 'Moved ticket to *Approved* column'
+                'content': f'Moved connected {t.issues} to *Approved* column'
             },
             {
                 'type': 'cli',
@@ -812,6 +812,11 @@ def emit(t: T, target_branch: str):
                                'Moved connected issue to *Merged stable* column in ZenHub',
                                f'Moved connected {t.issues} to *Merged lower* column in ZenHub')
             }),
+            iif(target_branch == 'develop' and t is not T.backport, {
+                'type': 'cli',
+                'content': 'Moved blocked issues to *Triage*',
+                'alt': f'or no issues are blocked on the connected {t.issues}'
+            }),
             iif(t is T.upgrade,
                 {
                     'type': 'cli',

UPGRADING.rst

@@ -20,6 +20,15 @@ reverted. This is all fairly informal and loosely defined. Hopefully we won't
 have too many entries in this file.
 
 
+#6355 Explicitly configure source type in environment files
+===========================================================
+
+The ``mksrc`` function in ``environment.py`` has been updated. For each of your
+personal deployments, update the function and insert the string ``'biqguery'``
+as its first argument at all call sites. As always, use the sandbox deployment's
+``environment.py`` as a model when upgrading personal deployments.
+
+
 #6446 Base image of Azul image is not pinned to digest
 ======================================================
 

scripts/recan_bundle_tdr.py → attic/scripts/recan_bundle_tdr.py

@@ -177,7 +177,6 @@ def dss_bundle_to_tdr(bundle: Bundle, source: TDRSourceRef) -> TDRHCABundle:
     links_entry = None
     for entry in manifest:
         entry['version'] = convert_version(entry['version'])
-        entry['is_stitched'] = False
         if entry['name'] == 'links.json':
             links_entry = entry
         if entry['indexed']:

deployments/anvilbox/environment.py

@@ -3,6 +3,7 @@
 )
 import json
 from typing import (
+    Literal,
     Optional,
 )
 
@@ -27,20 +28,21 @@ def common_prefix(n: int) -> str:
 pop = 2  # remove snapshot
 
 
-def mksrc(google_project,
+def mksrc(source_type: Literal['bigquery', 'parquet'],
+          google_project,
           snapshot,
           subgraphs,
           flags: int = 0,
           /,
           prefix: Optional[str] = None
-          ) -> tuple[str, str]:
+          ) -> tuple[str, str | None]:
     project = '_'.join(snapshot.split('_')[1:-3])
     assert flags <= ma | pop
     if prefix is None:
         prefix = common_prefix(subgraphs)
     source = None if flags & pop else ':'.join([
         'tdr',
-        'bigquery',
+        source_type,
         'gcp',
         google_project,
         snapshot,
@@ -71,9 +73,9 @@ def mkdict(previous_catalog: dict[str, str],
 
 
 anvil_sources = mkdict({}, 3, mkdelta([
-    mksrc('datarepo-dev-e53e74aa', 'ANVIL_1000G_2019_Dev_20230609_ANV5_202306121732', 6804),
-    mksrc('datarepo-dev-42c70e6a', 'ANVIL_CCDG_Sample_1_20230228_ANV5_202302281520', 28),
-    mksrc('datarepo-dev-97ad270b', 'ANVIL_CMG_Sample_1_20230225_ANV5_202302281509', 25)
+    mksrc('bigquery', 'datarepo-dev-e53e74aa', 'ANVIL_1000G_2019_Dev_20230609_ANV5_202306121732', 6804),
+    mksrc('bigquery', 'datarepo-dev-42c70e6a', 'ANVIL_CCDG_Sample_1_20230228_ANV5_202302281520', 28),
+    mksrc('bigquery', 'datarepo-dev-97ad270b', 'ANVIL_CMG_Sample_1_20230225_ANV5_202302281509', 25)
 ]))
 
 

deployments/anvildev/environment.py

@@ -3,6 +3,7 @@
 )
 import json
 from typing import (
+    Literal,
     Optional,
 )
 
@@ -22,12 +23,17 @@ def partition_prefix_length(n: int) -> int:
 pop = 2  # remove snapshot
 
 
-def mksrc(google_project, snapshot, subgraphs, flags: int = 0) -> tuple[str, str]:
+def mksrc(source_type: Literal['bigquery', 'parquet'],
+          google_project,
+          snapshot,
+          subgraphs,
+          flags: int = 0
+          ) -> tuple[str, str | None]:
     project = '_'.join(snapshot.split('_')[1:-3])
     assert flags <= ma | pop
     source = None if flags & pop else ':'.join([
         'tdr',
-        'bigquery',
+        source_type,
         'gcp',
         google_project,
         snapshot,
@@ -58,9 +64,9 @@ def mkdict(previous_catalog: dict[str, str],
 
 
 anvil_sources = mkdict({}, 3, mkdelta([
-    mksrc('datarepo-dev-e53e74aa', 'ANVIL_1000G_2019_Dev_20230609_ANV5_202306121732', 6804),
-    mksrc('datarepo-dev-42c70e6a', 'ANVIL_CCDG_Sample_1_20230228_ANV5_202302281520', 28),
-    mksrc('datarepo-dev-97ad270b', 'ANVIL_CMG_Sample_1_20230225_ANV5_202302281509', 25)
+    mksrc('bigquery', 'datarepo-dev-e53e74aa', 'ANVIL_1000G_2019_Dev_20230609_ANV5_202306121732', 6804),
+    mksrc('bigquery', 'datarepo-dev-42c70e6a', 'ANVIL_CCDG_Sample_1_20230228_ANV5_202302281520', 28),
+    mksrc('bigquery', 'datarepo-dev-97ad270b', 'ANVIL_CMG_Sample_1_20230225_ANV5_202302281509', 25)
 ]))