Skip to content

Commit 9d8ca01

Browse files
committed
style: update ruff
1 parent c68f9e7 commit 9d8ca01

File tree

7 files changed

+27
-30
lines changed

7 files changed

+27
-30
lines changed

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ src = ["src"]
9393
exclude = ["docs/source/conf.py"]
9494

9595
[tool.ruff.lint]
96+
select = ["ALL"]
9697
ignore = [
9798
# unused
9899
"AIR",
@@ -152,14 +153,16 @@ ignore = [
152153
# INP001 - implicit-namespace-package
153154
# SLF001 - private-member-access
154155
# ARG001 - unused-function-argument
156+
# PLR2004 - magic-value-comparison
155157
"tests/*" = [
156158
"ANN001",
157159
"ANN2",
158160
"D",
159161
"S101",
160162
"INP001",
161163
"SLF001",
162-
"ARG001"
164+
"ARG001",
165+
"PLR2004",
163166
]
164167
"*__init__.py" = ["F401"]
165168
"src/cool_seq_tool/schemas.py" = ["ANN201", "N805", "ANN001"]

src/cool_seq_tool/handlers/seqrepo_access.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ def get_reference_sequence(
5858
start, end = get_inter_residue_pos(start, end, coordinate_type)
5959
if start == end:
6060
end += 1
61-
else:
62-
if start is not None and coordinate_type == CoordinateType.RESIDUE:
63-
start -= 1
61+
elif start is not None and coordinate_type == CoordinateType.RESIDUE:
62+
start -= 1
6463

6564
try:
6665
sequence = self.sr.fetch(ac, start=start, end=end)

src/cool_seq_tool/mappers/alignment.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,10 @@ async def p_to_c(
6868
# codon. We want to return inter-residue (0-based), so we subtract 1 from this.
6969
if coordinate_type == CoordinateType.RESIDUE:
7070
c_pos = (p_start_pos * 3) - 3, p_end_pos * 3
71+
elif p_start_pos == p_end_pos:
72+
c_pos = ((p_start_pos + 1) * 3) - 3, (p_end_pos + 1) * 3
7173
else:
72-
if p_start_pos == p_end_pos:
73-
c_pos = ((p_start_pos + 1) * 3) - 3, (p_end_pos + 1) * 3
74-
else:
75-
c_pos = ((p_start_pos + 1) * 3) - 3, p_end_pos * 3
74+
c_pos = ((p_start_pos + 1) * 3) - 3, p_end_pos * 3
7675

7776
return {
7877
"c_ac": c_ac,

src/cool_seq_tool/mappers/exon_genomic_coords.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -723,11 +723,10 @@ def _get_tx_segment(
723723
seg_genomic_pos = offset + genomic_ac_data.alt_start_i
724724
else:
725725
seg_genomic_pos = genomic_ac_data.alt_end_i - offset
726+
elif strand == Strand.POSITIVE:
727+
seg_genomic_pos = offset + genomic_ac_data.alt_end_i
726728
else:
727-
if strand == Strand.POSITIVE:
728-
seg_genomic_pos = offset + genomic_ac_data.alt_end_i
729-
else:
730-
seg_genomic_pos = genomic_ac_data.alt_start_i - offset
729+
seg_genomic_pos = genomic_ac_data.alt_start_i - offset
731730

732731
genomic_loc, err_msg = self._get_vrs_seq_loc(
733732
genomic_ac,

src/cool_seq_tool/mappers/feature_overlap.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,13 @@ def get_grch38_mane_gene_cds_overlap(
158158
if not re.match(f"^{CHR_PATTERN}$", chromosome):
159159
error_msg = "`chromosome` must be 1, ..., 22, X, or Y"
160160
raise FeatureOverlapError(error_msg)
161+
elif identifier:
162+
chromosome = self._get_chr_from_alt_ac(identifier)
163+
if identifier.startswith("ga4gh:SQ."):
164+
ga4gh_seq_id = identifier
161165
else:
162-
if identifier:
163-
chromosome = self._get_chr_from_alt_ac(identifier)
164-
if identifier.startswith("ga4gh:SQ."):
165-
ga4gh_seq_id = identifier
166-
else:
167-
error_msg = "Must provide either `chromosome` or `identifier`"
168-
raise FeatureOverlapError(error_msg)
166+
error_msg = "Must provide either `chromosome` or `identifier`"
167+
raise FeatureOverlapError(error_msg)
169168

170169
# Convert residue to inter-residue
171170
if coordinate_type == CoordinateType.RESIDUE:
@@ -234,8 +233,8 @@ def _get_seq_loc(
234233

235234
resp = {}
236235
refget_ac = ga4gh_seq_id.split("ga4gh:")[-1]
237-
for gene, group in feature_df.group_by("gene"):
238-
gene = gene[0]
236+
for gene_l, group in feature_df.group_by("gene"):
237+
gene = gene_l[0]
239238
_gene_overlap_data = [
240239
CdsOverlap(
241240
cds=_get_seq_loc(

src/cool_seq_tool/mappers/mane_transcript.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -545,10 +545,9 @@ def _validate_reading_frames(
545545
new_rf,
546546
)
547547
return False
548-
else:
549-
if pos_index == 0:
550-
_logger.warning("%s must having start position", ac)
551-
return False
548+
elif pos_index == 0:
549+
_logger.warning("%s must having start position", ac)
550+
return False
552551
return True
553552

554553
def _validate_references(

src/cool_seq_tool/sources/uta_database.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -664,11 +664,10 @@ async def get_genomic_tx_data(
664664
genomic_tx_data.alt_pos_range[0] + pos_change[0],
665665
genomic_tx_data.alt_pos_range[1] - pos_change[1],
666666
)
667+
elif genomic_tx_data.strand == Strand.NEGATIVE:
668+
alt_pos_change_range = (pos[1], pos[0])
667669
else:
668-
if genomic_tx_data.strand == Strand.NEGATIVE:
669-
alt_pos_change_range = (pos[1], pos[0])
670-
else:
671-
alt_pos_change_range = pos
670+
alt_pos_change_range = pos
672671

673672
return GenomicTxMetadata(
674673
**genomic_tx_data.model_dump(),
@@ -953,7 +952,7 @@ def database(self) -> str | None:
953952
def schema(self) -> str | None:
954953
"""Create schema property."""
955954
path_elems = self.path.split("/")
956-
return path_elems[2] if len(path_elems) > 2 else None
955+
return path_elems[2] if len(path_elems) > 2 else None # noqa: PLR2004
957956

958957
@property
959958
def sanitized_url(self) -> str:

0 commit comments

Comments
 (0)