Skip to content

Commit

Permalink
Sort imports to resolve conflicts in pacbio dev branch (#3542)(patch)
Browse files Browse the repository at this point in the history
## Description
#3365 reordered some imports in some files that are deleted/refactored on the `dev-pacbio-flow` (#3453) branch, which is messing with the automatic conflict resolution. The easiest way to solve this is to redo these changes in this PR.
  • Loading branch information
diitaz93 authored Aug 8, 2024
1 parent 60f09a9 commit 04d0bfe
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 31 deletions.
5 changes: 1 addition & 4 deletions cg/services/pacbio/metrics/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
PolymeraseDataAttributeIDs,
SmrtLinkDatabasesIDs,
)
from cg.utils.calculations import (
divide_by_thousand_with_one_decimal,
fraction_to_percent,
)
from cg.utils.calculations import divide_by_thousand_with_one_decimal, fraction_to_percent

BaseMetrics = TypeVar("BaseMetrics", bound=BaseModel)

Expand Down
34 changes: 7 additions & 27 deletions cg/store/crud/read.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,10 @@
from cg.constants.constants import CaseActions, CustomerId, PrepCategory, SampleType
from cg.exc import CaseNotFoundError, CgError, OrderNotFoundError, SampleNotFoundError
from cg.server.dto.orders.orders_request import OrdersRequest
from cg.server.dto.samples.collaborator_samples_request import (
CollaboratorSamplesRequest,
)
from cg.server.dto.samples.collaborator_samples_request import CollaboratorSamplesRequest
from cg.store.base import BaseHandler
from cg.store.filters.status_analysis_filters import (
AnalysisFilter,
apply_analysis_filter,
)
from cg.store.filters.status_application_filters import (
ApplicationFilter,
apply_application_filter,
)
from cg.store.filters.status_analysis_filters import AnalysisFilter, apply_analysis_filter
from cg.store.filters.status_application_filters import ApplicationFilter, apply_application_filter
from cg.store.filters.status_application_limitations_filters import (
ApplicationLimitationsFilter,
apply_application_limitations_filter,
Expand All @@ -32,23 +24,14 @@
apply_application_versions_filter,
)
from cg.store.filters.status_bed_filters import BedFilter, apply_bed_filter
from cg.store.filters.status_bed_version_filters import (
BedVersionFilter,
apply_bed_version_filter,
)
from cg.store.filters.status_bed_version_filters import BedVersionFilter, apply_bed_version_filter
from cg.store.filters.status_case_filters import CaseFilter, apply_case_filter
from cg.store.filters.status_case_sample_filters import (
CaseSampleFilter,
apply_case_sample_filter,
)
from cg.store.filters.status_case_sample_filters import CaseSampleFilter, apply_case_sample_filter
from cg.store.filters.status_collaboration_filters import (
CollaborationFilter,
apply_collaboration_filter,
)
from cg.store.filters.status_customer_filters import (
CustomerFilter,
apply_customer_filter,
)
from cg.store.filters.status_customer_filters import CustomerFilter, apply_customer_filter
from cg.store.filters.status_illumina_flow_cell_filters import (
IlluminaFlowCellFilter,
apply_illumina_flow_cell_filters,
Expand All @@ -63,10 +46,7 @@
)
from cg.store.filters.status_invoice_filters import InvoiceFilter, apply_invoice_filter
from cg.store.filters.status_order_filters import OrderFilter, apply_order_filters
from cg.store.filters.status_organism_filters import (
OrganismFilter,
apply_organism_filter,
)
from cg.store.filters.status_organism_filters import OrganismFilter, apply_organism_filter
from cg.store.filters.status_panel_filters import PanelFilter, apply_panel_filter
from cg.store.filters.status_pool_filters import PoolFilter, apply_pool_filter
from cg.store.filters.status_sample_filters import SampleFilter, apply_sample_filter
Expand Down

0 comments on commit 04d0bfe

Please sign in to comment.