diff --git a/Dockerfile b/Dockerfile index 20f48e3..474b7fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,4 @@ ENV PATH="${VENV}/bin:$PATH" # Install from PyPI RUN pip install --upgrade pip -RUN pip install crispr-ambiguous-mapping==0.0.150 +RUN pip install crispr-ambiguous-mapping==0.0.151 diff --git a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/models/editing_models.py b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/models/editing_models.py index 5c5524b..4ae4809 100644 --- a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/models/editing_models.py +++ b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/models/editing_models.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from typing import Counter as CounterType from typing import Tuple, Optional, DefaultDict, Dict -from .types import * +from .types import GeneralAlleleCountSeriesDict import pandas as pd @dataclass diff --git a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/parsing/reporter_umitools_fastq_parsing.py b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/parsing/reporter_umitools_fastq_parsing.py index 0575a46..a5536a3 100644 --- a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/parsing/reporter_umitools_fastq_parsing.py +++ b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/parsing/reporter_umitools_fastq_parsing.py @@ -4,7 +4,7 @@ from typeguard import typechecked from typing import Union, Optional, List, Tuple, DefaultDict from typing import Counter as CounterType -from ..models.types import * +from ..models.types import ProtospacerCounter, ProtospacerDictUMICounter, ProtospacerBarcodeCounter, ProtospacerBarcodeDictUMICounter, ProtospacerSurrogateCounter, ProtospacerSurrogateDictUMICounter, ProtospacerSurrogateBarcodeCounter, ProtospacerSurrogateBarcodeDictUMICounter from collections import Counter from typing import Callable from functools import partial diff --git a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_guide_counting.py b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_guide_counting.py index 1956c7a..5b51693 100644 --- a/crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_guide_counting.py +++ b/crispr-ambiguous-mapping/crispr_ambiguous_mapping/processing/crispr_guide_counting.py @@ -25,8 +25,8 @@ from . import crispr_guide_inference from .crispr_count_processing import get_counterseries_all_results from ..quality_control.crispr_mapping_quality_control import perform_counts_quality_control -from ..models.mapping_models import * -from ..models.editing_models import * +from ..models.types import GeneralGuideCountType, GeneralMappingInferenceDict +from ..models.mapping_models import WhitelistReporterCountsResult, InferenceResult, CountInput # TODO: There will probably be some type errors with the DefaultDict when testing on non UMI (since it requires CounterType), so make sure to test with different variations of inputs diff --git a/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151-py3-none-any.whl b/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151-py3-none-any.whl new file mode 100644 index 0000000..0b73324 Binary files /dev/null and b/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151-py3-none-any.whl differ diff --git a/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151.tar.gz b/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151.tar.gz new file mode 100644 index 0000000..4eb614a Binary files /dev/null and b/crispr-ambiguous-mapping/dist/crispr_ambiguous_mapping-0.0.151.tar.gz differ diff --git a/crispr-ambiguous-mapping/pyproject.toml b/crispr-ambiguous-mapping/pyproject.toml index 717bf6c..3aa0df6 100644 --- a/crispr-ambiguous-mapping/pyproject.toml +++ b/crispr-ambiguous-mapping/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "crispr-ambiguous-mapping" -version = "0.0.150" +version = "0.0.151" description = "" authors = ["Basheer Becerra "] readme = "README.md"