-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
38 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{% set name = "metaphlan" %} | ||
{% set version = "4.0" %} | ||
{% set version = "3.1" %} | ||
|
||
package: | ||
name: {{ name }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ | |
'Duy Tin Truong, ' | ||
'Francesco Asnicar ([email protected]), ' | ||
'Aitor Blanco Miguez ([email protected])') | ||
__version__ = '3.0.14' | ||
__date__ = '19 Jan 2022' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import sys | ||
try: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0.14' | ||
__date__ = '19 Jan 2022' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
|
||
import sys | ||
|
@@ -29,7 +29,7 @@ | |
metaphlan_script_install_folder = os.path.dirname(os.path.abspath(__file__)) | ||
DEFAULT_DB_FOLDER = os.path.join(metaphlan_script_install_folder, "metaphlan_databases") | ||
DEFAULT_DB_FOLDER = os.environ.get('METAPHLAN_DB_DIR', DEFAULT_DB_FOLDER) | ||
DEFAULT_DB_NAME = "mpa_v30_CHOCOPhlAn_201901.pkl" | ||
DEFAULT_DB_NAME = "mpa_v31_CHOCOPhlAn_201901.pkl" | ||
DEFAULT_DATABASE = os.path.join(DEFAULT_DB_FOLDER, DEFAULT_DB_NAME) | ||
PHYLOPHLAN_MODES = ['accurate', 'fast'] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
#!/usr/bin/env python | ||
__author__ = ('Duy Tin Truong ([email protected]), ' | ||
'Aitor Blanco Miguez ([email protected])') | ||
__version__ = '3.0' | ||
__date__ = '21 Feb 2020' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2021' | ||
|
||
import argparse as ap | ||
import pandas | ||
|
@@ -102,4 +102,4 @@ def main(): | |
ofile.write(line) | ||
|
||
if __name__ == '__main__': | ||
main() | ||
main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0.8' | ||
__date__ = '7 May 2021' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import os, sys, re, shutil, tempfile | ||
import subprocess as sb | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0.14' | ||
__date__ = '19 Jan 2022' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import sys | ||
try: | ||
|
@@ -31,7 +31,7 @@ | |
metaphlan_script_install_folder = os.path.dirname(os.path.abspath(__file__)) | ||
DEFAULT_DB_FOLDER = os.path.join(metaphlan_script_install_folder, "../metaphlan_databases") | ||
DEFAULT_DB_FOLDER = os.environ.get('METAPHLAN_DB_DIR', DEFAULT_DB_FOLDER) | ||
DEFAULT_DB_NAME = "mpa_v30_CHOCOPhlAn_201901.pkl" | ||
DEFAULT_DB_NAME = "mpa_v31_CHOCOPhlAn_201901.pkl" | ||
DEFAULT_DATABASE = os.path.join(DEFAULT_DB_FOLDER, DEFAULT_DB_NAME) | ||
|
||
""" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0' | ||
__date__ = '21 Feb 2020' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
try: | ||
from .util_fun import error | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
#!/usr/bin/env python | ||
__author__ = ('Duy Tin Truong ([email protected]), ' | ||
'Aitor Blanco Miguez ([email protected])') | ||
__version__ = '3.0' | ||
__date__ = '21 Feb 2020' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import argparse as ap | ||
import dendropy | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0.14' | ||
__date__ = '19 Jan 2022' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import sys | ||
try: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
__author__ = ('Aitor Blanco ([email protected]), ' | ||
'Mireia Valles-Colomer ([email protected])') | ||
__version__ = '3.0.14' | ||
__date__ = '19 Jan 2022' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
import os, time, sys | ||
import argparse as ap | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,8 @@ | |
'Francesco Asnicar ([email protected]), ' | ||
'Moreno Zolfo ([email protected]), ' | ||
'Francesco Beghini ([email protected])') | ||
__version__ = '3.0' | ||
__date__ = '21 Feb 2020' | ||
__version__ = '3.1.0' | ||
__date__ = '25 Jul 2022' | ||
|
||
|
||
import os, sys, re, pickletools, pickle, time, bz2, gzip | ||
|
@@ -134,4 +134,4 @@ def is_number(s): | |
int(s) | ||
return True | ||
except ValueError: | ||
return False | ||
return False |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ | |
|
||
setuptools.setup( | ||
name='MetaPhlAn', | ||
version='3.0.14', | ||
version='3.1.0', | ||
author='Francesco Beghini', | ||
author_email='[email protected]', | ||
url='http://github.com/biobakery/MetaPhlAn/', | ||
|