diff --git a/README.md b/README.md index 4a8f9a5..e672762 100644 --- a/README.md +++ b/README.md @@ -59,21 +59,18 @@ cayman \ \ \ \ - --db_format hmmer \ [--out_prefix ] \ [--min_identity ] \ [--min_seqlen ] \ [--cpus_for_alignment ] ``` -`cayman`'s default input format is bed4. `--db_format hmmer` is required when using the csv-formatted hmmer annotations from [Zenodo](https://zenodo.org/records/10473258). - ### Mandatory parameters * `` 1. Read files need to be in fastq format (best with `fastq` or `fq` file ending) and can be gzip compressed. - + 2. The `` parameters depend on the library layout of your samples: * Paired-end data can be specified with `--reads1 --reads2 `. Each read will be counted as `0.5`. * Single-end data can be specified with `--singles `. Each read will be counted as `1`. diff --git a/cayman/__init__.py b/cayman/__init__.py index a9cba84..e30be43 100644 --- a/cayman/__init__.py +++ b/cayman/__init__.py @@ -1,3 +1,3 @@ """ module docstring """ -__version__ = "0.9.6" +__version__ = "0.9.7" __toolname__ = "cayman" diff --git a/cayman/handle_args.py b/cayman/handle_args.py index a094a46..09c1651 100644 --- a/cayman/handle_args.py +++ b/cayman/handle_args.py @@ -34,6 +34,7 @@ def handle_args(args): formatter_class=argparse.RawTextHelpFormatter, parents=(log_ap,), ) + ap.add_argument( "annotation_db", type=str, @@ -44,10 +45,20 @@ def handle_args(args): ), ) + ap.add_argument( + "bwa_index", + type=str, + help=textwrap.dedent( + """\ + Path to the bwa reference index. + """ + ), + ) + ap.add_argument( "--db_format", type=str, - default="bed", + default="hmmer", choices=("bed", "hmmer"), help="Format of the annotation database.", ) @@ -67,15 +78,6 @@ def handle_args(args): # help="Separator-character for the annotation database file Default: '\\t'." # ) - ap.add_argument( - "bwa_index", - type=str, - help=textwrap.dedent( - """\ - Path to the bwa reference index. - """ - ), - ) ap.add_argument( "-1",