Skip to content

Commit

Permalink
export v1: Remove --metadata-id-columns
Browse files Browse the repository at this point in the history
This was added to both export v1 and v2 as part of a larger change¹, but
that change was incomplete and did not work as intended. It has been
fixed for export v2².

Since export v1 is no longer being maintained, remove the option instead
of trying to fix it here as well.

¹ 42f6cb2
² 9bf1b4c
  • Loading branch information
victorlin committed Jul 26, 2023
1 parent 7b299ac commit 0354812
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions augur/export_v1.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from collections import defaultdict
from .errors import AugurError
from .argparse_ import ExtendAction
from .io.metadata import DEFAULT_DELIMITERS, DEFAULT_ID_COLUMNS, InvalidDelimiter, read_metadata
from .io.metadata import DEFAULT_DELIMITERS, InvalidDelimiter, read_metadata
from .utils import read_node_data, write_json, read_config, read_lat_longs, read_colors

def convert_tree_to_json_structure(node, metadata, div=0, strains=None):
Expand Down Expand Up @@ -315,8 +315,6 @@ def add_core_args(parser):
core.add_argument('--metadata', required=True, metavar="FILE", help="sequence metadata")
core.add_argument('--metadata-delimiters', default=DEFAULT_DELIMITERS, nargs="+",
help="delimiters to accept when reading a metadata file. Only one delimiter will be inferred.")
core.add_argument('--metadata-id-columns', default=DEFAULT_ID_COLUMNS, nargs="+",
help="names of possible metadata columns containing identifier information, ordered by priority. Only one ID column will be inferred.")
core.add_argument('--node-data', required=True, nargs='+', action=ExtendAction, help="JSON files with meta data for each node")
core.add_argument('--output-tree', help="JSON file name that is passed on to auspice (e.g., zika_tree.json).")
core.add_argument('--output-meta', help="JSON file name that is passed on to auspice (e.g., zika_meta.json).")
Expand Down Expand Up @@ -376,8 +374,7 @@ def run(args):
try:
meta_tsv = read_metadata(
args.metadata,
delimiters=args.metadata_delimiters,
id_columns=args.metadata_id_columns)
delimiters=args.metadata_delimiters)
except InvalidDelimiter:
raise AugurError(
f"Could not determine the delimiter of {args.metadata!r}. "
Expand Down

0 comments on commit 0354812

Please sign in to comment.