Merge pull request #10 from tjiangHIT/master

Update installation

README.md

@@ -1,20 +1,11 @@
-# rMETL: 
-rMETL - realignment-based Mobile Element insertion detection Tool for Long read
-
----
-### Getting Start
 		        __        __   ______   _________   _
 		 _ __  |  \      /  | |  ____| |___   ___| | |
 		| ^__| |   \    /   | | |___       | |     | |
 		| |    | |\ \  / /| | |  ___|      | |     | |
 		| |    | | \ \/ / | | | |____      | |     | |____
 		|_|    |_|  \__/  |_| |______|     |_|     |______|
      
-
-	$ git clone https://github.com/tjiangHIT/rMETL.git (git clone https://github.com/hitbc/rMETL.git)
-	$ cd rMETL/
-	$ bash INSTALL.sh
-	$ ./rMETL.py
+	rMETL - realignment-based Mobile Element insertion detection Tool for Long read
 
 ---	
 ### Introduction
@@ -45,10 +36,15 @@ Its peak memory footprint is about 7.05 Gigabytes (default setting), on a server
 ---
 ### Installation
 
+	#install via pip
+	$ pip install rMETL
+
+	#install from github
+	$ git clone https://github.com/tjiangHIT/rMETL.git (git clone https://github.com/hitbc/rMETL.git)
+	$ cd rMETL/
+	$ pip install .
+
 Current version of rMETL has been tested on 64bit Linux operating system.
-The source code is written in python, and can be directly download from: https://github.com/hitbc/rMETL 
-A mirror is also in: https://github.com/tjiangHIT/rMETL
-The INSTALL.sh is attached. Use the bash command for generating the executable file.
 
 ---
 ### Synopsis

setup.py

@@ -2,27 +2,29 @@
 
 from setuptools import setup, find_packages
 
-LONG_DESCRIPTION = '''Mobile element insertion (MEI) is a major category of structure variations (SVs). 
-The rapid development of long read sequencing provides the opportunity to sensitively discover MEIs. 
-However, the signals of MEIs implied by noisy long reads are highly complex, due to the repetitiveness 
-of mobile elements as well as the serious sequencing errors. Herein, we propose Realignment-based 
-Mobile Element insertion detection Tool for Long read (rMETL). rMETL takes advantage of 
-its novel chimeric read re-alignment approach to well handle complex MEI signals. 
-Benchmarking results on simulated and real datasets demonstrated that rMETL has the ability 
-to more sensitivity discover MEIs as well as prevent false positives. 
+LONG_DESCRIPTION = '''Mobile element insertion (MEI) is a major category of structure variations (SVs). \
+The rapid development of long read sequencing provides the opportunity to sensitively discover MEIs. \
+However, the signals of MEIs implied by noisy long reads are highly complex, due to the repetitiveness \
+of mobile elements as well as the serious sequencing errors. Herein, we propose Realignment-based \
+Mobile Element insertion detection Tool for Long read (rMETL). rMETL takes advantage of \
+its novel chimeric read re-alignment approach to well handle complex MEI signals. \
+Benchmarking results on simulated and real datasets demonstrated that rMETL has the ability \
+to more sensitivity discover MEIs as well as prevent false positives. \
 It is suited to produce high quality MEI callsets in many genomics studies.'''
 
 setup(
     name = "rMETL",
-    version = "1.0.2",
+    version = "1.0.4",
     description = "realignment-based Mobile Element insertion detection Tool for Long read",
     author = "Jiang Tao",
     author_email = "[email protected]",
     url = "https://github.com/tjiangHIT/rMETL",
-    license = "MIT Licence",
-    packages = find_packages('src'),
-    package_dir = {'': 'src'},
+    license = "MIT",
+    packages = find_packages("src"),
+    package_dir = {"": "src"},
+    data_files = [("", ["LICENSE"])],
+    scripts=['src/rMETL/rMETL'],
     long_description = LONG_DESCRIPTION,
     zip_safe = False,
     install_requires = ['pysam', 'Biopython', 'Cigar']
-)
+)

src/rMETL.py → src/rMETL/rMETL

@@ -11,10 +11,10 @@
 '''
 
 import argparse
-import rMETL_extraction
-import rMETL_realign
-import rMETL_MEIcalling
-from rMETL_version import __version__, __author__, __contact__
+import rMETL.rMETL_extraction as rMETL_extraction
+import rMETL.rMETL_realign as rMETL_realign
+import rMETL.rMETL_MEIcalling as rMETL_MEIcalling
+from rMETL.rMETL_version import __version__, __author__, __contact__
 
 STAGES = {'detection': rMETL_extraction.run, \
           'realignment': rMETL_realign.run, \

src/rMETL_MEIcalling.py → src/rMETL/rMETL_MEIcalling.py

@@ -17,10 +17,10 @@
 import cigar
 
 from collections import Counter
-from rMETL_version import __version__, __author__, __contact__
-from rMETL_genotype import simple_call_genotype
-from rMETL_cmdRunner import setupLogging
-from rMETL_utils import load_ref
+from rMETL.rMETL_version import __version__, __author__, __contact__
+from rMETL.rMETL_genotype import simple_call_genotype
+from rMETL.rMETL_cmdRunner import setupLogging
+from rMETL.rMETL_utils import load_ref
 
 USAGE="""\
            _  ___  _   _____   _______   _

src/rMETL_extraction.py → src/rMETL/rMETL_extraction.py

@@ -20,11 +20,11 @@
 import gc
 
 from multiprocessing import Pool
-from rMETL_version import __version__, __author__, __contact__
-from rMETL_concensus import construct_concensus_info
-from rMETL_genotype import add_genotype
-from rMETL_utils import load_ref, check_bai, call_ngmlr, call_samtools
-from rMETL_cmdRunner import setupLogging, exe
+from rMETL.rMETL_version import __version__, __author__, __contact__
+from rMETL.rMETL_concensus import construct_concensus_info
+from rMETL.rMETL_genotype import add_genotype
+from rMETL.rMETL_utils import load_ref, check_bai, call_ngmlr, call_samtools
+from rMETL.rMETL_cmdRunner import setupLogging, exe
 
 USAGE="""\
            _  ___  _   _____   _______   _

src/rMETL_realign.py → src/rMETL/rMETL_realign.py

@@ -15,8 +15,8 @@
 import sys
 import time
 
-from rMETL_version import __version__, __author__, __contact__
-from rMETL_cmdRunner import setupLogging, exe
+from rMETL.rMETL_version import __version__, __author__, __contact__
+from rMETL.rMETL_cmdRunner import setupLogging, exe
 
 USAGE="""\
            _  ___  _   _____   _______   _

src/rMETL_utils.py → src/rMETL/rMETL_utils.py

@@ -4,7 +4,7 @@
 import logging
 import os
 from Bio import SeqIO
-from rMETL_cmdRunner import exe
+from rMETL.rMETL_cmdRunner import exe
 
 def load_ref(ref_g):
 	logging.info("Loading reference genome...")

src/rMETL_version.py → src/rMETL/rMETL_version.py

@@ -1,5 +1,5 @@
 # * @author: Jiang Tao ([email protected])
 
-__version__ = '1.0.3'
+__version__ = '1.0.4'
 __author__ = 'Jiang Tao'
 __contact__ = '[email protected]'