Merge pull request #3 from aweimann/master

v1.02

Dockerfile

@@ -1,20 +1,20 @@
 ############################################################
-# Dockerfile to run traitar - the microbial trait analyzer 
+# Dockerfile to run Traitar - the microbial trait analyzer 
 # Based on Ubuntu Image
 ############################################################
 
 # Set the base image to use to Ubuntu
-FROM ubuntu:14.04
+FROM ubuntu:trusty 
 
 RUN apt-get update
 MAINTAINER Aaron Weimann (weimann@hhu.de)
 RUN apt-get install -y python-scipy python-matplotlib python-pip python-pandas
 RUN echo "deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse ">> /etc/apt/sources.list 
-RUN sudo apt-get update
+RUN apt-get update
 RUN apt-get install -y hmmer prodigal
 RUN apt-get install -y wget 
-COPY dist/traitar-1.0.0.tar.gz /tmp
+COPY dist/traitar-1.0.1.tar.gz /tmp
 COPY traitar/data/sample_data /tmp/sample_data
-RUN pip install /tmp/traitar-1.0.0.tar.gz
+RUN pip install /tmp/traitar-1.0.1.tar.gz
 COPY Pfam-A.hmm /tmp
 RUN traitar pfam --local /tmp

traitar/_version.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.0.2"

traitar/traitar

@@ -149,7 +149,7 @@ class Traitar:
             self.run_gene_prediction(self.s2f.loc[:,"sample_file_name"], self.s2f.loc[:,"sample_name"])
             print pfam_msg
             sys.stdout.flush()
-            self.run_hmmer_annotation(self.s2f.loc[:,"sample_file_name"], self.s2f.loc[:,"sample_name"], mode)
+            self.run_hmmer_annotation(self.s2f.loc[:,"sample_name"], self.s2f.loc[:,"sample_name"], mode)
         if mode == "from_genes": 
             print pfam_msg
             sys.stdout.flush()