proper conditional for minlen

nextgenusfs · Jun 10, 2023 · ccc1b2b · ccc1b2b
2 parents c1ad189 + f6063f3
commit ccc1b2b
Show file tree

Hide file tree

Showing 8 changed files with 9,075 additions and 5,385 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ RUN mamba create -c conda-forge -c bioconda -c defaults \
     -n funannotate --yes "python>=3.6,<3.9" biopython xlrd==1.2.0 \
     "trinity==2.8.5" "evidencemodeler==1.1.1" "pasa==2.4.1" "codingquarry==2.0" \
     "proteinortho==6.0.16" goatools matplotlib-base natsort numpy pigz \
-    pandas psutil requests scikit-learn scipy seaborn "blast=2.2.31" \
+    pandas psutil requests "scikit-learn<1.0.0" scipy seaborn "blast=2.2.31" \
     tantan bedtools hmmer exonerate "diamond>=2.0.5" tbl2asn blat "trnascan-se>=2.0" \
     ucsc-pslcdnafilter trimmomatic raxml iqtree trimal "mafft>=7" hisat2 \
     "kallisto==0.46.1" minimap2 stringtie "salmon>=0.9" "samtools>=1.9" \

diff --git a/funannotate/__version__.py b/funannotate/__version__.py
@@ -1,3 +1,3 @@
-VERSION = (1, 8, 14)
+VERSION = (1, 8, 15)
 
-__version__ = '.'.join(map(str, VERSION))
+__version__ = ".".join(map(str, VERSION))
diff --git a/funannotate/annotate.py b/funannotate/annotate.py
@@ -1123,8 +1123,8 @@ def __init__(self, prog):
             "homolog": "",
             "EC": "",
             "COG": "",
-            "inactivated": "",
-            "related": "",
+            "inactivated": " ",
+            " related": " ",
             "family": "",
             "gene": "protein",
             "homologue": "",

diff --git a/funannotate/compare.py b/funannotate/compare.py