Merge pull request #33 from yutanagano/develop

Develop

VERSION.txt

@@ -1 +1 @@
-1.8.4
+1.8.5

src/tidytcells/_utils/abstract_functions.py

@@ -137,7 +137,7 @@ def standardize_aa_template(seq: str, on_fail: str, suppress_warnings: bool):
         if not char in AMINO_ACIDS:
             if not suppress_warnings:
                 warn(
-                    f"Input {original_input} was rejected as it is not a valid amino acid sequence."
+                    f"Failed to standardize {original_input}: not a valid amino acid sequence."
                 )
             if on_fail == "reject":
                 return None

src/tidytcells/junction/_main.py

@@ -84,7 +84,7 @@ def standardize(
         if strict:
             if not suppress_warnings:
                 warn(
-                    f"Input {original_input} was rejected as it is not a valid junction sequence."
+                    f"Failed to standardize {original_input}: not a valid junction sequence."
                 )
             if on_fail == "reject":
                 return None

tests/test_aa.py

@@ -12,7 +12,7 @@ def test_alreadY_correct(self, seq):
 
     @pytest.mark.parametrize("seq", ("123456", "ASDFGHJKL", "A?AAAA", "AAAXAA"))
     def test_various_rejections(self, seq):
-        with pytest.warns(UserWarning, match="is not a valid amino acid"):
+        with pytest.warns(UserWarning, match="not a valid amino acid"):
             result = aa.standardize(seq=seq)
 
         assert result == None

tests/test_junction.py

@@ -28,7 +28,7 @@ def test_already_correct(self, seq):
 
     @pytest.mark.parametrize("seq", ("123456", "ASDFGHJKL", "A?AAAA", "AAAXAA"))
     def test_various_rejections(self, seq):
-        with pytest.warns(UserWarning, match="is not a valid amino acid sequence"):
+        with pytest.warns(UserWarning, match="not a valid amino acid sequence"):
             result = junction.standardise(seq=seq)
 
         assert result is None
@@ -54,7 +54,7 @@ def test_bad_input_type(self, seq):
 
     @pytest.mark.parametrize("seq", ("ASQY", "CASQY", "ASQYF", "ASQYW"))
     def test_strict(self, seq):
-        with pytest.warns(UserWarning, match="is not a valid junction"):
+        with pytest.warns(UserWarning, match="not a valid junction"):
             result = junction.standardise(seq=seq, strict=True)
 
         assert result is None