From 77388e18b5fd7982779d10fb2d0a2461532f3c7e Mon Sep 17 00:00:00 2001
From: John Huddleston <huddlej@gmail.com>
Date: Thu, 7 Nov 2024 11:10:45 -0800
Subject: [PATCH] Revert to subclade as default branch label

Use subclade as default branch label in private builds, since Augur's
validation of the Auspice config JSON doesn't allow default branch
labels to have spaces, underscores, or hyphens [1].

[1] https://github.com/nextstrain/augur/issues/1661
---
 profiles/nextflu-private/h1n1pdm/ha/auspice_config.json | 2 +-
 profiles/nextflu-private/h1n1pdm/na/auspice_config.json | 2 +-
 profiles/nextflu-private/h3n2/ha/auspice_config.json    | 2 +-
 profiles/nextflu-private/h3n2/na/auspice_config.json    | 2 +-
 profiles/nextflu-private/vic/ha/auspice_config.json     | 2 +-
 profiles/nextflu-private/vic/na/auspice_config.json     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/profiles/nextflu-private/h1n1pdm/ha/auspice_config.json b/profiles/nextflu-private/h1n1pdm/ha/auspice_config.json
index a9b7a5f..5de47ac 100644
--- a/profiles/nextflu-private/h1n1pdm/ha/auspice_config.json
+++ b/profiles/nextflu-private/h1n1pdm/ha/auspice_config.json
@@ -400,7 +400,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",
diff --git a/profiles/nextflu-private/h1n1pdm/na/auspice_config.json b/profiles/nextflu-private/h1n1pdm/na/auspice_config.json
index 270bd5d..90df5f2 100644
--- a/profiles/nextflu-private/h1n1pdm/na/auspice_config.json
+++ b/profiles/nextflu-private/h1n1pdm/na/auspice_config.json
@@ -178,7 +178,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",
diff --git a/profiles/nextflu-private/h3n2/ha/auspice_config.json b/profiles/nextflu-private/h3n2/ha/auspice_config.json
index 4e06766..4b4c3d9 100644
--- a/profiles/nextflu-private/h3n2/ha/auspice_config.json
+++ b/profiles/nextflu-private/h3n2/ha/auspice_config.json
@@ -564,7 +564,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",
diff --git a/profiles/nextflu-private/h3n2/na/auspice_config.json b/profiles/nextflu-private/h3n2/na/auspice_config.json
index 4a90f8a..b4b8ed5 100644
--- a/profiles/nextflu-private/h3n2/na/auspice_config.json
+++ b/profiles/nextflu-private/h3n2/na/auspice_config.json
@@ -240,7 +240,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",
diff --git a/profiles/nextflu-private/vic/ha/auspice_config.json b/profiles/nextflu-private/vic/ha/auspice_config.json
index 6ab6789..d515568 100644
--- a/profiles/nextflu-private/vic/ha/auspice_config.json
+++ b/profiles/nextflu-private/vic/ha/auspice_config.json
@@ -278,7 +278,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",
diff --git a/profiles/nextflu-private/vic/na/auspice_config.json b/profiles/nextflu-private/vic/na/auspice_config.json
index 9e921d7..6f177ff 100644
--- a/profiles/nextflu-private/vic/na/auspice_config.json
+++ b/profiles/nextflu-private/vic/na/auspice_config.json
@@ -196,7 +196,7 @@
   "display_defaults": {
     "map_triplicate": true,
     "color_by": "proposed_subclade",
-    "branch_label": "Proposed subclade"
+    "branch_label": "subclade"
   },
   "filters": [
     "clade_membership",