diff --git a/conformance/results/mypy/generics_variance.toml b/conformance/results/mypy/generics_variance.toml index 531a60fc..30810aac 100644 --- a/conformance/results/mypy/generics_variance.toml +++ b/conformance/results/mypy/generics_variance.toml @@ -14,13 +14,9 @@ generics_variance.py:131: error: Variance of TypeVar "T_contra" incompatible wit conformance_automated = "Fail" errors_diff = """ Line 113: Expected 1 errors -Line 126: Expected 1 errors -Line 132: Expected 1 errors -Line 142: Expected 1 errors Line 163: Expected 1 errors Line 167: Expected 1 errors Line 191: Expected 1 errors -Line 196: Expected 1 errors -Line 125: Unexpected errors ['generics_variance.py:125: error: Variance of TypeVar "T_co" incompatible with variance in parent type [type-var]'] -Line 131: Unexpected errors ['generics_variance.py:131: error: Variance of TypeVar "T_contra" incompatible with variance in parent type [type-var]'] +Lines 141, 142: Expected error (tag 'CoContra_Child5') +Lines 195, 196: Expected error (tag 'ContraToContraToContra_WithTA') """ diff --git a/conformance/results/mypy/tuples_unpacked.toml b/conformance/results/mypy/tuples_unpacked.toml index ad33667a..5f51cf2b 100644 --- a/conformance/results/mypy/tuples_unpacked.toml +++ b/conformance/results/mypy/tuples_unpacked.toml @@ -11,5 +11,5 @@ errors_diff = """ Line 40: Expected 1 errors Line 41: Expected 1 errors Line 51: Expected 1 errors -Line 61: Expected 1 errors +Lines 60, 61: Expected error (tag 't14') """ diff --git a/conformance/results/pyre/generics_variance.toml b/conformance/results/pyre/generics_variance.toml index 3bf5ddc0..3054f35e 100644 --- a/conformance/results/pyre/generics_variance.toml +++ b/conformance/results/pyre/generics_variance.toml @@ -15,13 +15,9 @@ conformance_automated = "Fail" errors_diff = """ Line 14: Expected 1 errors Line 113: Expected 1 errors -Line 126: Expected 1 errors -Line 132: Expected 1 errors -Line 142: Expected 1 errors Line 163: Expected 1 errors Line 167: Expected 1 errors Line 191: Expected 1 errors -Line 196: Expected 1 errors -Line 125: Unexpected errors ['generics_variance.py:125:0 Invalid type variance [46]: The type variable `Variable[T_co](covariant)` is incompatible with parent class type variable `Variable[T_contra](contravariant)` because subclasses cannot use more permissive type variables than their superclasses.'] -Line 131: Unexpected errors ['generics_variance.py:131:0 Invalid type variance [46]: The type variable `Variable[T_contra](contravariant)` is incompatible with parent class type variable `Variable[T_co](covariant)` because subclasses cannot use more permissive type variables than their superclasses.'] +Lines 141, 142: Expected error (tag 'CoContra_Child5') +Lines 195, 196: Expected error (tag 'ContraToContraToContra_WithTA') """ diff --git a/conformance/results/pyre/tuples_unpacked.toml b/conformance/results/pyre/tuples_unpacked.toml index 19a41857..9e1dd53b 100644 --- a/conformance/results/pyre/tuples_unpacked.toml +++ b/conformance/results/pyre/tuples_unpacked.toml @@ -21,7 +21,6 @@ tuples_unpacked.py:60:5 Invalid type [31]: Expression `tuple[(typing.Unpack[tupl """ conformance_automated = "Fail" errors_diff = """ -Line 61: Expected 1 errors Line 16: Unexpected errors ['tuples_unpacked.py:16:13 Invalid type [31]: Expression `tuple[(int, *tuple[(bool, bool)], str)]` is not a valid type.'] Line 18: Unexpected errors ['tuples_unpacked.py:18:19 Invalid type [31]: Expression `tuple[(*tuple[(int, bool)], bool, str)]` is not a valid type.'] Line 19: Unexpected errors ['tuples_unpacked.py:19:19 Invalid type [31]: Expression `tuple[(int, bool, *tuple[(bool, str)])]` is not a valid type.'] @@ -32,5 +31,4 @@ Line 38: Unexpected errors ['tuples_unpacked.py:38:4 Invalid type [31]: Expressi Line 39: Unexpected errors ['tuples_unpacked.py:39:4 Invalid type [31]: Expression `tuple[(*tuple[(str, *tuple[(str, ...)])])]` is not a valid type.'] Line 49: Unexpected errors ['tuples_unpacked.py:49:13 Invalid type [31]: Expression `tuple[(*Ts)]` is not a valid type.'] Line 50: Unexpected errors ['tuples_unpacked.py:50:8 Invalid type [31]: Expression `tuple[(*tuple[str], *Ts)]` is not a valid type.'] -Line 60: Unexpected errors ['tuples_unpacked.py:60:5 Invalid type [31]: Expression `tuple[(typing.Unpack[tuple[(str, typing.Unpack[tuple[(str, ...)]])]], typing.Unpack[tuple[(int, ...)]])]` is not a valid type.'] """ diff --git a/conformance/results/pyre/version.toml b/conformance/results/pyre/version.toml index cd590f23..5686e9cb 100644 --- a/conformance/results/pyre/version.toml +++ b/conformance/results/pyre/version.toml @@ -1,2 +1,2 @@ version = "pyre 0.9.22" -test_duration = 1.7 +test_duration = 1.6 diff --git a/conformance/results/pytype/generics_variance.toml b/conformance/results/pytype/generics_variance.toml index 71f928f3..92664946 100644 --- a/conformance/results/pytype/generics_variance.toml +++ b/conformance/results/pytype/generics_variance.toml @@ -17,13 +17,13 @@ Line 81: Expected 1 errors Line 93: Expected 1 errors Line 105: Expected 1 errors Line 113: Expected 1 errors -Line 126: Expected 1 errors -Line 132: Expected 1 errors -Line 142: Expected 1 errors Line 163: Expected 1 errors Line 167: Expected 1 errors Line 191: Expected 1 errors -Line 196: Expected 1 errors +Lines 125, 126: Expected error (tag 'CoContra_Child2') +Lines 131, 132: Expected error (tag 'CoContra_Child3') +Lines 141, 142: Expected error (tag 'CoContra_Child5') +Lines 195, 196: Expected error (tag 'ContraToContraToContra_WithTA') Line 18: Unexpected errors ['File "generics_variance.py", line 18, in : argument "covariant" to TypeVar not supported yet [not-supported-yet]'] Line 19: Unexpected errors ['File "generics_variance.py", line 19, in : argument "contravariant" to TypeVar not supported yet [not-supported-yet]'] Line 27: Unexpected errors ['File "generics_variance.py", line 27, in __iter__: bad return type [bad-return-type]'] diff --git a/conformance/results/pytype/tuples_unpacked.toml b/conformance/results/pytype/tuples_unpacked.toml index ff0e3854..78e943a8 100644 --- a/conformance/results/pytype/tuples_unpacked.toml +++ b/conformance/results/pytype/tuples_unpacked.toml @@ -34,7 +34,7 @@ File "tuples_unpacked.py", line 51, in func3: Invalid type annotation 'tuple[*tu conformance_automated = "Fail" errors_diff = """ Line 59: Expected 1 errors -Line 61: Expected 1 errors +Lines 60, 61: Expected error (tag 't14') Line 13: Unexpected errors ['File "tuples_unpacked.py", line 13, in : typing.Unpack not supported yet [not-supported-yet]', 'File "tuples_unpacked.py", line 13, in : typing.TypeVarTuple not supported yet [not-supported-yet]'] Line 16: Unexpected errors ['File "tuples_unpacked.py", line 16, in : Invalid type annotation \\'\\' [invalid-annotation]'] Line 17: Unexpected errors ['File "tuples_unpacked.py", line 17, in func1: Tuple[Any] [assert-type]'] diff --git a/conformance/results/pytype/version.toml b/conformance/results/pytype/version.toml index f9329856..736e8295 100644 --- a/conformance/results/pytype/version.toml +++ b/conformance/results/pytype/version.toml @@ -1,2 +1,2 @@ version = "pytype 2024.04.11" -test_duration = 34.2 +test_duration = 34.0 diff --git a/conformance/results/results.html b/conformance/results/results.html index bd5dd6d2..cc7f3a09 100644 --- a/conformance/results/results.html +++ b/conformance/results/results.html @@ -165,10 +165,10 @@

Python Type System Conformance Test Results

1.5sec
pyre 0.9.22
-
1.7sec
+
1.6sec
pytype 2024.04.11
-
34.2sec
+
34.0sec
diff --git a/conformance/tests/generics_variance.py b/conformance/tests/generics_variance.py index c4b8682c..0b3e732b 100644 --- a/conformance/tests/generics_variance.py +++ b/conformance/tests/generics_variance.py @@ -122,14 +122,14 @@ class CoContra_Child1(CoContra[T_co, T_contra]): # OK ... -class CoContra_Child2( - CoContra[T_co, T_co] # E: Second type arg must be contravariant +class CoContra_Child2( # E[CoContra_Child2]: Second type arg must be contravariant + CoContra[T_co, T_co] # E[CoContra_Child2]: Second type arg must be contravariant ): ... -class CoContra_Child3( - CoContra[T_contra, T_contra] # E: First type arg must be covariant +class CoContra_Child3( # E[CoContra_Child3]: First type arg must be covariant + CoContra[T_contra, T_contra] # E[CoContra_Child3]: First type arg must be covariant ): ... @@ -138,8 +138,8 @@ class CoContra_Child4(CoContra[T, T]): # OK ... -class CoContra_Child5( - CoContra[Co[T_co], Co[T_co]] # E: Second type arg must be contravariant +class CoContra_Child5( # E[CoContra_Child5]: Second type arg must be contravariant + CoContra[Co[T_co], Co[T_co]] # E[CoContra_Child5]: Second type arg must be contravariant ): ... @@ -192,7 +192,7 @@ class CoToContraToContra_WithTA(Contra_TA[Co_TA[Contra_TA[T_contra]]]): # E ... -class ContraToContraToContra_WithTA( - Contra_TA[Contra_TA[Contra_TA[T_co]]] # E +class ContraToContraToContra_WithTA( # E[ContraToContraToContra_WithTA] + Contra_TA[Contra_TA[Contra_TA[T_co]]] # E[ContraToContraToContra_WithTA] ): ... diff --git a/conformance/tests/tuples_unpacked.py b/conformance/tests/tuples_unpacked.py index ca58af7a..706b58f8 100644 --- a/conformance/tests/tuples_unpacked.py +++ b/conformance/tests/tuples_unpacked.py @@ -57,6 +57,6 @@ def func3(t: tuple[*Ts]): t11: tuple[Unpack[tuple[str]], Unpack[tuple[str]]] # OK t12: tuple[Unpack[tuple[str, Unpack[tuple[str, ...]]]]] # OK t13: tuple[Unpack[tuple[str, ...]], Unpack[tuple[int, ...]]] # E -t14: tuple[ - Unpack[tuple[str, Unpack[tuple[str, ...]]]], Unpack[tuple[int, ...]] # E +t14: tuple[ # E[t14] + Unpack[tuple[str, Unpack[tuple[str, ...]]]], Unpack[tuple[int, ...]] # E[t14] ]