Merge pull request #84 from pirovc/dev

version 0.1.4

.travis.yml

@@ -60,6 +60,8 @@ before_install:
   - python3 -m pip install --user --upgrade pip
   - python3 -m pip install --user binpacking==1.4.1
   - git clone https://github.com/pirovc/taxsbp.git
+  - git clone https://github.com/pirovc/pylca.git pylca_repo
+  - mv pylca_repo/pylca/ .
   - if [ "$BUILD_TYPE" == "Coverage" ]; then 
       python3 -m pip install --user coverage;
     fi

CMakeLists.txt

@@ -3,7 +3,7 @@
 # =============================================================================
 
 cmake_minimum_required( VERSION 3.10 FATAL_ERROR )
-project( ganon VERSION 0.1.3 LANGUAGES CXX )
+project( ganon VERSION 0.1.4 LANGUAGES CXX )
 
 # -----------------------------------------------------------------------------
 # build setup

README.md

@@ -134,9 +134,8 @@ detailed report for lca matches (one per hierarchy)
 	3) % reads assigned <tab>
 	4) # reads assigned (total) <tab>
 	5) # reads uniquely assigned <tab>
-	6) sum of k-mers matched <tab>
-	7) taxonomic rank <tab>
-	8) name
+	6) taxonomic rank <tab>
+	7) name
 
 #### .tre
 
@@ -178,6 +177,7 @@ taxonomic information required for LCA and reports
 - python >=3.4
 - taxsbp >=0.1.1
 - binpacking >=1.4.1
+- pylca >= 1.0.0
 - pandas
 - wget
 - curl