diff --git a/Dockerfile b/Dockerfile index 7f62924..349fed8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM python:3.11.3-slim ADD *.py /usr/local/bin/ -ADD src /usr/local/bin/src -ADD src/utils /usr/local/bin/src/utils +ADD cami_amber /usr/local/bin/cami_amber +ADD cami_amber/utils /usr/local/bin/cami_amber/utils ADD requirements.txt requirements.txt RUN pip install -r requirements.txt diff --git a/amber.py b/amber.py index f2e56cf..0da5114 100755 --- a/amber.py +++ b/amber.py @@ -15,6 +15,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from cami_amber import amber_html +from cami_amber import plot_by_genome +from cami_amber import plots +from cami_amber.utils import load_data +from cami_amber.utils import argparse_parents +from cami_amber.utils import labels as utils_labels +from cami_amber import binning_classes +from cami_amber.utils import load_ncbi_taxinfo +from version import __version__ import argparse import errno import logging @@ -23,15 +32,6 @@ import pandas as pd import matplotlib matplotlib.use('Agg') -from src import amber_html -from src import plot_by_genome -from src import plots -from version import __version__ -from src.utils import load_data -from src.utils import argparse_parents -from src.utils import labels as utils_labels -from src import binning_classes -from src.utils import load_ncbi_taxinfo def get_logger(output_dir, silent): diff --git a/src/__init__.py b/cami_amber/__init__.py similarity index 100% rename from src/__init__.py rename to cami_amber/__init__.py diff --git a/src/amber_html.py b/cami_amber/amber_html.py similarity index 99% rename from src/amber_html.py rename to cami_amber/amber_html.py index b6986ea..26f7f33 100644 --- a/src/amber_html.py +++ b/cami_amber/amber_html.py @@ -24,10 +24,10 @@ import logging from jinja2 import Template from statistics import median -from src import plots -from src import binning_classes -from src.utils import labels as utils_labels -from src.utils import load_ncbi_taxinfo +from cami_amber import plots +from cami_amber import binning_classes +from cami_amber.utils import labels as utils_labels +from cami_amber.utils import load_ncbi_taxinfo import matplotlib matplotlib.use('Agg') diff --git a/src/binning_classes.py b/cami_amber/binning_classes.py similarity index 99% rename from src/binning_classes.py rename to cami_amber/binning_classes.py index bbeb243..c89b4e0 100755 --- a/src/binning_classes.py +++ b/cami_amber/binning_classes.py @@ -25,12 +25,12 @@ from abc import ABC, abstractmethod from collections import defaultdict from collections import OrderedDict -from src.utils import labels as utils_labels -from src.utils import load_ncbi_taxinfo -from src.utils import ProfilingTools as pf -from src import unifrac_distance as uf -from src import precision_recall_per_bin -from src import plots +from cami_amber.utils import labels as utils_labels +from cami_amber.utils import load_ncbi_taxinfo +from cami_amber.utils import ProfilingTools as pf +from cami_amber import unifrac_distance as uf +from cami_amber import precision_recall_per_bin +from cami_amber import plots class Metrics: diff --git a/src/plot_by_genome.py b/cami_amber/plot_by_genome.py similarity index 98% rename from src/plot_by_genome.py rename to cami_amber/plot_by_genome.py index 52974f3..f786626 100755 --- a/src/plot_by_genome.py +++ b/cami_amber/plot_by_genome.py @@ -23,8 +23,8 @@ currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) parentdir = os.path.dirname(currentdir) sys.path.insert(0, parentdir) -from src import plots -from src.utils import labels as utils_labels +from cami_amber import plots +from cami_amber.utils import labels as utils_labels def plot_by_genome(data, out_file=None, sort_by='completeness'): diff --git a/src/plots.py b/cami_amber/plots.py similarity index 99% rename from src/plots.py rename to cami_amber/plots.py index c750283..9785e4e 100755 --- a/src/plots.py +++ b/cami_amber/plots.py @@ -13,9 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from src.utils import labels as utils_labels -from src.utils import load_ncbi_taxinfo -from src import binning_classes +from cami_amber.utils import labels as utils_labels +from cami_amber.utils import load_ncbi_taxinfo +from cami_amber import binning_classes import matplotlib matplotlib.use('Agg') import seaborn as sns diff --git a/src/precision_recall_per_bin.py b/cami_amber/precision_recall_per_bin.py similarity index 100% rename from src/precision_recall_per_bin.py rename to cami_amber/precision_recall_per_bin.py diff --git a/src/unifrac_distance.py b/cami_amber/unifrac_distance.py similarity index 96% rename from src/unifrac_distance.py rename to cami_amber/unifrac_distance.py index e33cf2a..528f833 100644 --- a/src/unifrac_distance.py +++ b/cami_amber/unifrac_distance.py @@ -1,6 +1,6 @@ # This is an example of how to use the script -from src.utils import ProfilingTools as PF -from src.utils import EMDUnifrac as EMDU +from cami_amber.utils import ProfilingTools as PF +from cami_amber.utils import EMDUnifrac as EMDU import numpy as np import argparse import copy diff --git a/src/utils/EMDUnifrac.py b/cami_amber/utils/EMDUnifrac.py similarity index 100% rename from src/utils/EMDUnifrac.py rename to cami_amber/utils/EMDUnifrac.py diff --git a/src/utils/ProfilingTools.py b/cami_amber/utils/ProfilingTools.py similarity index 100% rename from src/utils/ProfilingTools.py rename to cami_amber/utils/ProfilingTools.py diff --git a/src/utils/__init__.py b/cami_amber/utils/__init__.py similarity index 100% rename from src/utils/__init__.py rename to cami_amber/utils/__init__.py diff --git a/src/utils/add_length_column.py b/cami_amber/utils/add_length_column.py similarity index 100% rename from src/utils/add_length_column.py rename to cami_amber/utils/add_length_column.py diff --git a/src/utils/argparse_parents.py b/cami_amber/utils/argparse_parents.py similarity index 100% rename from src/utils/argparse_parents.py rename to cami_amber/utils/argparse_parents.py diff --git a/src/utils/convert_fasta_bins_to_biobox_format.py b/cami_amber/utils/convert_fasta_bins_to_biobox_format.py similarity index 100% rename from src/utils/convert_fasta_bins_to_biobox_format.py rename to cami_amber/utils/convert_fasta_bins_to_biobox_format.py diff --git a/src/utils/labels.py b/cami_amber/utils/labels.py similarity index 100% rename from src/utils/labels.py rename to cami_amber/utils/labels.py diff --git a/src/utils/load_data.py b/cami_amber/utils/load_data.py similarity index 99% rename from src/utils/load_data.py rename to cami_amber/utils/load_data.py index af23f3e..e95e729 100755 --- a/src/utils/load_data.py +++ b/cami_amber/utils/load_data.py @@ -22,8 +22,8 @@ from multiprocessing.pool import ThreadPool from collections import defaultdict from collections import OrderedDict -from src import binning_classes -from src.utils import labels as utils_labels +from cami_amber import binning_classes +from cami_amber.utils import labels as utils_labels try: import load_ncbi_taxinfo diff --git a/src/utils/load_ncbi_taxinfo.py b/cami_amber/utils/load_ncbi_taxinfo.py similarity index 100% rename from src/utils/load_ncbi_taxinfo.py rename to cami_amber/utils/load_ncbi_taxinfo.py