Changes to attempt to fix the Python 3.10 pipeline.

Author: rhliang

src/easyhla/models.py

@@ -1,7 +1,7 @@
 import re
 from collections.abc import Iterable
 from operator import itemgetter
-from typing import Final, Optional, Self
+from typing import Final, Optional
 
 import numpy as np
 from pydantic import BaseModel, ConfigDict
@@ -61,7 +61,7 @@ def sequence_np(self) -> np.ndarray:
         return np.array(self.sequence)
 
     @classmethod
-    def from_raw_standard(cls, raw_standard: HLARawStandard) -> Self:
+    def from_raw_standard(cls, raw_standard: HLARawStandard) -> "HLAStandard":
         return cls(
             allele=raw_standard.allele,
             two=nuc2bin(raw_standard.exon2),
@@ -155,7 +155,7 @@ def __init__(
         @classmethod
         def from_frequency_entry(
             cls, raw_first_allele: str, raw_second_allele: str
-        ) -> Optional[Self]:
+        ) -> Optional["HLAProteinPair.NonAlleleException"]:
             first_unmapped: bool = False
             first_deprecated: bool = False
             second_unmapped: bool = False
@@ -184,7 +184,7 @@ def from_frequency_entry(
         cls,
         raw_first_allele: str,
         raw_second_allele: str,
-    ) -> Self:
+    ) -> "HLAProteinPair":
         any_problems: Optional[HLAProteinPair.NonAlleleException] = (
             HLAProteinPair.NonAlleleException.from_frequency_entry(
                 raw_first_allele, raw_second_allele

src/easyhla/update_frequency_file_lib.py

@@ -3,7 +3,7 @@
 from collections import Counter
 from dataclasses import dataclass
 from io import TextIOBase
-from typing import Final, Optional, Self, TypedDict, cast
+from typing import Final, Optional, TypedDict, cast
 
 from .easyhla import EasyHLA
 from .models import HLAProteinPair
@@ -25,7 +25,7 @@ class OldName:
     field_2: str
 
     @classmethod
-    def from_string(cls, old_name_str: str) -> Self:
+    def from_string(cls, old_name_str: str) -> "OldName":
         """
         Build an instance directly from an entry in the nomenclature mapping.
 
@@ -46,7 +46,9 @@ def from_string(cls, old_name_str: str) -> Self:
         return cls(locus, field_1, field_2)
 
     @classmethod
-    def from_old_frequency_format(cls, locus: HLA_LOCUS, four_digit_code: str) -> Self:
+    def from_old_frequency_format(
+        cls, locus: HLA_LOCUS, four_digit_code: str
+    ) -> "OldName":
         """
         Build an instance from an entry in the old frequency file format.
 
@@ -71,7 +73,7 @@ class NewName:
     field_2: str
 
     @classmethod
-    def from_string(cls, new_name_str: str) -> Self:
+    def from_string(cls, new_name_str: str) -> "NewName":
         """
         Build an instance directly from an entry in the nomenclature mapping.
 

src/easyhla/utils.py

@@ -4,7 +4,7 @@
 from collections import defaultdict
 from collections.abc import Iterable, Sequence
 from datetime import datetime
-from typing import Final, Literal, Optional, Self, cast
+from typing import Final, Literal, Optional, cast
 
 import numpy as np
 from Bio.SeqIO import SeqRecord
@@ -549,7 +549,7 @@ class StoredHLAStandards(BaseModel):
     checksum: Optional[str] = None
 
     @model_validator(mode="after")
-    def compute_compare_checksum(self) -> Self:
+    def compute_compare_checksum(self) -> "StoredHLAStandards":
         checksum: str = compute_stored_standard_checksum(
             self.tag,
             self.commit_hash,