Update imports in tests to use prymer over prymer.model

fulcrumgenomics · Jan 15, 2025 · d5df89f · d5df89f
1 parent 30d99c9
commit d5df89f
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 33 deletions.
diff --git a/tests/api/test_picking.py b/tests/api/test_picking.py
@@ -7,12 +7,12 @@
 from fgpyo.fasta.builder import FastaBuilder
 from fgpyo.sequence import reverse_complement
 
+from prymer import MinOptMax
+from prymer import Oligo
+from prymer import PrimerPair
+from prymer import Span
 from prymer.api import picking
 from prymer.api.melting import calculate_long_seq_tm
-from prymer.model import MinOptMax
-from prymer.model import Oligo
-from prymer.model import PrimerPair
-from prymer.model import Span
 from prymer.primer3 import PrimerAndAmpliconWeights
 
 

diff --git a/tests/api/test_variant_lookup.py b/tests/api/test_variant_lookup.py
@@ -12,15 +12,15 @@
 from fgpyo.vcf.builder import VcfFieldType
 from pysam import VariantRecord
 
+from prymer import Span
+from prymer import Strand
 from prymer.api.variant_lookup import FileBasedVariantLookup
 from prymer.api.variant_lookup import SimpleVariant
 from prymer.api.variant_lookup import VariantOverlapDetector
 from prymer.api.variant_lookup import VariantType
 from prymer.api.variant_lookup import cached
 from prymer.api.variant_lookup import calc_maf_from_filter
 from prymer.api.variant_lookup import disk_based
-from prymer.model import Span
-from prymer.model import Strand
 
 
 @pytest.mark.parametrize(

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -8,8 +8,8 @@
 from fgpyo.fasta.sequence_dictionary import SequenceDictionary
 from fgpyo.fasta.sequence_dictionary import SequenceMetadata
 
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Span
+from prymer import Strand
 
 
 @pytest.fixture

diff --git a/tests/model/test_minoptmax.py b/tests/model/test_minoptmax.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from prymer.model import MinOptMax
+from prymer import MinOptMax
 
 Numeric = TypeVar("Numeric", int, float)
 

diff --git a/tests/model/test_oligo.py b/tests/model/test_oligo.py
@@ -6,9 +6,9 @@
 import pytest
 from fgpyo.fasta.sequence_dictionary import SequenceDictionary
 
-from prymer.model import Oligo
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Oligo
+from prymer import Span
+from prymer import Strand
 
 
 @pytest.mark.parametrize(

diff --git a/tests/model/test_primer_pair.py b/tests/model/test_primer_pair.py
@@ -6,10 +6,10 @@
 from fgpyo.fasta.sequence_dictionary import SequenceDictionary
 from fgpyo.sequence import reverse_complement
 
-from prymer.model import Oligo
-from prymer.model import PrimerPair
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Oligo
+from prymer import PrimerPair
+from prymer import Span
+from prymer import Strand
 
 
 @dataclass(init=True, frozen=True)

diff --git a/tests/model/test_span.py b/tests/model/test_span.py
@@ -1,8 +1,8 @@
 import pytest
 from fgpyo.fasta.sequence_dictionary import SequenceDictionary
 
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Span
+from prymer import Strand
 
 
 @pytest.mark.parametrize(

diff --git a/tests/offtarget/test_offtarget.py b/tests/offtarget/test_offtarget.py
@@ -5,10 +5,10 @@
 import pytest
 from fgpyo.sam import Cigar
 
-from prymer.model import Oligo
-from prymer.model import PrimerPair
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Oligo
+from prymer import PrimerPair
+from prymer import Span
+from prymer import Strand
 from prymer.offtarget.bwa import BWA_EXECUTABLE_NAME
 from prymer.offtarget.bwa import BwaHit
 from prymer.offtarget.bwa import BwaResult

diff --git a/tests/primer3/test_primer3.py b/tests/primer3/test_primer3.py
@@ -6,12 +6,12 @@
 import pytest
 from fgpyo.sequence import reverse_complement
 
+from prymer import MinOptMax
+from prymer import Oligo
+from prymer import PrimerPair
+from prymer import Span
+from prymer import Strand
 from prymer.api.variant_lookup import cached
-from prymer.model import MinOptMax
-from prymer.model import Oligo
-from prymer.model import PrimerPair
-from prymer.model import Span
-from prymer.model import Strand
 from prymer.primer3.primer3 import Primer3
 from prymer.primer3.primer3 import Primer3Failure
 from prymer.primer3.primer3 import Primer3Result

diff --git a/tests/primer3/test_primer3_input.py b/tests/primer3/test_primer3_input.py
@@ -1,8 +1,8 @@
 import pytest
 
-from prymer.model import MinOptMax
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import MinOptMax
+from prymer import Span
+from prymer import Strand
 from prymer.primer3 import DesignLeftPrimersTask
 from prymer.primer3 import DesignPrimerPairsTask
 from prymer.primer3 import DesignRightPrimersTask

diff --git a/tests/primer3/test_primer3_parameters.py b/tests/primer3/test_primer3_parameters.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from prymer.model import MinOptMax
+from prymer import MinOptMax
 from prymer.primer3.primer3_input_tag import Primer3InputTag
 from prymer.primer3.primer3_parameters import PrimerAndAmpliconParameters
 from prymer.primer3.primer3_parameters import ProbeParameters

diff --git a/tests/primer3/test_primer3_task.py b/tests/primer3/test_primer3_task.py
@@ -1,7 +1,7 @@
 import pytest
 
-from prymer.model import Span
-from prymer.model import Strand
+from prymer import Span
+from prymer import Strand
 from prymer.primer3.primer3_input_tag import Primer3InputTag
 from prymer.primer3.primer3_task import DesignLeftPrimersTask
 from prymer.primer3.primer3_task import DesignPrimerPairsTask