Skip to content

Commit cacb92d

Browse files
committed
refactor: drop plasmodium.py and test_plasmodium.py changes from this PR
1 parent 563e27f commit cacb92d

2 files changed

Lines changed: 3 additions & 39 deletions

File tree

malariagen_data/plasmodium.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,22 +232,17 @@ def _resolve_region(self, region):
232232
def _subset_genome_sequence_region(
233233
self, genome, region, inline_array=True, chunks="native"
234234
):
235-
"""Subset reference genome sequence."""
235+
"""Sebset reference genome sequence."""
236236
region = self._resolve_region(region)
237237
z = genome[region.contig]
238238

239239
d = _da_from_zarr(z, inline_array=inline_array, chunks=chunks)
240240

241-
if region.start is not None:
242-
if region.start < 1:
243-
raise ValueError("Region start must be >= 1 or None.")
241+
if region.start:
244242
slice_start = region.start - 1
245243
else:
246244
slice_start = None
247-
248-
if region.end is not None:
249-
if region.end < 1:
250-
raise ValueError("Region end must be >= 1 or None.")
245+
if region.end:
251246
slice_stop = region.end
252247
else:
253248
slice_stop = None

tests/test_plasmodium.py

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -690,37 +690,6 @@ def test_subset_genome_sequence_contig2(self):
690690
assert sequence.shape == (15,)
691691
assert sequence.ndim == 1
692692

693-
def test_subset_genome_sequence_region_slice(self):
694-
from malariagen_data.util import Region
695-
696-
# contig1 is np.arange(10)
697-
# Valid slice 1-3 -> indices 0,1,2 (length 3)
698-
region = Region("contig1", 1, 3)
699-
sequence = self.test_plasmodium_class._subset_genome_sequence_region(
700-
genome=self.test_ref_zarr, region=region
701-
)
702-
assert isinstance(sequence, da.Array)
703-
assert sequence.shape == (3,)
704-
assert sequence.compute().tolist() == [0, 1, 2]
705-
706-
def test_subset_genome_sequence_region_invalid_start_0(self):
707-
from malariagen_data.util import Region
708-
709-
region = Region("contig1", 0, 3)
710-
with self.assertRaises(ValueError):
711-
self.test_plasmodium_class._subset_genome_sequence_region(
712-
genome=self.test_ref_zarr, region=region
713-
)
714-
715-
def test_subset_genome_sequence_region_invalid_end_0(self):
716-
from malariagen_data.util import Region
717-
718-
region = Region("contig1", 1, 0)
719-
with self.assertRaises(ValueError):
720-
self.test_plasmodium_class._subset_genome_sequence_region(
721-
genome=self.test_ref_zarr, region=region
722-
)
723-
724693

725694
if __name__ == "__main__":
726695
unittest.main()

0 commit comments

Comments
 (0)