Remove unused patch
Remove unused `Make-tests-pass-on-conda-builds.patch` to fix ci_failed.
This commit is contained in:
Han Guangyu
parent
55f183c413
commit
1b87ea980a
@ -1,255 +0,0 @@
|
||||
From 41a828801a60e8e20bd2d9b172b2e3fbd9604d87 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Waygood <Alex.Waygood@Gmail.com>
|
||||
Date: Sun, 23 Apr 2023 15:57:36 -0600
|
||||
Subject: [PATCH] Make tests pass on conda builds (#151)
|
||||
|
||||
---
|
||||
src/test_typing_extensions.py | 178 +++++++++++++++++++++++++++++-----
|
||||
1 file changed, 153 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/test_typing_extensions.py b/src/test_typing_extensions.py
|
||||
--- a/src/test_typing_extensions.py 2023-02-15 08:13:43.620018500 +0800
|
||||
+++ b/src/test_typing_extensions.py 2024-02-02 14:31:02.474690860 +0800
|
||||
@@ -7,19 +7,23 @@
|
||||
import collections.abc
|
||||
import copy
|
||||
from functools import lru_cache
|
||||
+import importlib
|
||||
import inspect
|
||||
import pickle
|
||||
import subprocess
|
||||
+import tempfile
|
||||
import types
|
||||
+from pathlib import Path
|
||||
from unittest import TestCase, main, skipUnless, skipIf
|
||||
from unittest.mock import patch
|
||||
-from test import ann_module, ann_module2, ann_module3
|
||||
import typing
|
||||
from typing import TypeVar, Optional, Union, AnyStr
|
||||
from typing import T, KT, VT # Not in __all__.
|
||||
from typing import Tuple, List, Dict, Iterable, Iterator, Callable
|
||||
from typing import Generic
|
||||
from typing import no_type_check
|
||||
+import warnings
|
||||
+
|
||||
import typing_extensions
|
||||
from typing_extensions import NoReturn, Any, ClassVar, Final, IntVar, Literal, Type, NewType, TypedDict, Self
|
||||
from typing_extensions import TypeAlias, ParamSpec, Concatenate, ParamSpecArgs, ParamSpecKwargs, TypeGuard
|
||||
@@ -31,7 +35,6 @@
|
||||
from typing_extensions import NamedTuple
|
||||
from typing_extensions import override, deprecated
|
||||
from _typed_dict_test_helper import Foo, FooGeneric
|
||||
-import warnings
|
||||
|
||||
# Flags used to mark tests that only apply after a specific
|
||||
# version of the typing module.
|
||||
@@ -46,6 +49,112 @@
|
||||
# versions, but not all
|
||||
HAS_FORWARD_MODULE = "module" in inspect.signature(typing._type_check).parameters
|
||||
|
||||
+ANN_MODULE_SOURCE = '''\
|
||||
+from typing import Optional
|
||||
+from functools import wraps
|
||||
+
|
||||
+__annotations__[1] = 2
|
||||
+
|
||||
+class C:
|
||||
+
|
||||
+ x = 5; y: Optional['C'] = None
|
||||
+
|
||||
+from typing import Tuple
|
||||
+x: int = 5; y: str = x; f: Tuple[int, int]
|
||||
+
|
||||
+class M(type):
|
||||
+
|
||||
+ __annotations__['123'] = 123
|
||||
+ o: type = object
|
||||
+
|
||||
+(pars): bool = True
|
||||
+
|
||||
+class D(C):
|
||||
+ j: str = 'hi'; k: str= 'bye'
|
||||
+
|
||||
+from types import new_class
|
||||
+h_class = new_class('H', (C,))
|
||||
+j_class = new_class('J')
|
||||
+
|
||||
+class F():
|
||||
+ z: int = 5
|
||||
+ def __init__(self, x):
|
||||
+ pass
|
||||
+
|
||||
+class Y(F):
|
||||
+ def __init__(self):
|
||||
+ super(F, self).__init__(123)
|
||||
+
|
||||
+class Meta(type):
|
||||
+ def __new__(meta, name, bases, namespace):
|
||||
+ return super().__new__(meta, name, bases, namespace)
|
||||
+
|
||||
+class S(metaclass = Meta):
|
||||
+ x: str = 'something'
|
||||
+ y: str = 'something else'
|
||||
+
|
||||
+def foo(x: int = 10):
|
||||
+ def bar(y: List[str]):
|
||||
+ x: str = 'yes'
|
||||
+ bar()
|
||||
+
|
||||
+def dec(func):
|
||||
+ @wraps(func)
|
||||
+ def wrapper(*args, **kwargs):
|
||||
+ return func(*args, **kwargs)
|
||||
+ return wrapper
|
||||
+'''
|
||||
+
|
||||
+ANN_MODULE_2_SOURCE = '''\
|
||||
+from typing import no_type_check, ClassVar
|
||||
+
|
||||
+i: int = 1
|
||||
+j: int
|
||||
+x: float = i/10
|
||||
+
|
||||
+def f():
|
||||
+ class C: ...
|
||||
+ return C()
|
||||
+
|
||||
+f().new_attr: object = object()
|
||||
+
|
||||
+class C:
|
||||
+ def __init__(self, x: int) -> None:
|
||||
+ self.x = x
|
||||
+
|
||||
+c = C(5)
|
||||
+c.new_attr: int = 10
|
||||
+
|
||||
+__annotations__ = {}
|
||||
+
|
||||
+
|
||||
+@no_type_check
|
||||
+class NTC:
|
||||
+ def meth(self, param: complex) -> None:
|
||||
+ ...
|
||||
+
|
||||
+class CV:
|
||||
+ var: ClassVar['CV']
|
||||
+
|
||||
+CV.var = CV()
|
||||
+'''
|
||||
+
|
||||
+ANN_MODULE_3_SOURCE = '''\
|
||||
+def f_bad_ann():
|
||||
+ __annotations__[1] = 2
|
||||
+
|
||||
+class C_OK:
|
||||
+ def __init__(self, x: int) -> None:
|
||||
+ self.x: no_such_name = x # This one is OK as proposed by Guido
|
||||
+
|
||||
+class D_bad_ann:
|
||||
+ def __init__(self, x: int) -> None:
|
||||
+ sfel.y: int = 0
|
||||
+
|
||||
+def g_bad_ann():
|
||||
+ no_such_name.attr: int = 0
|
||||
+'''
|
||||
+
|
||||
|
||||
class BaseTestCase(TestCase):
|
||||
def assertIsSubclass(self, cls, class_or_tuple, msg=None):
|
||||
@@ -375,8 +484,13 @@
|
||||
else:
|
||||
mod_name = 'typing_extensions'
|
||||
self.assertEqual(repr(Any), f"{mod_name}.Any")
|
||||
- if sys.version_info < (3, 11): # skip for now on 3.11+ see python/cpython#95987
|
||||
- self.assertEqual(repr(self.SubclassesAny), "<class 'test_typing_extensions.AnyTests.SubclassesAny'>")
|
||||
+
|
||||
+ @skipIf(sys.version_info[:3] == (3, 11, 0), "A bug was fixed in 3.11.1")
|
||||
+ def test_repr_on_Any_subclass(self):
|
||||
+ self.assertEqual(
|
||||
+ repr(self.SubclassesAny),
|
||||
+ f"<class '{self.SubclassesAny.__module__}.AnyTests.SubclassesAny'>"
|
||||
+ )
|
||||
|
||||
def test_instantiation(self):
|
||||
with self.assertRaises(TypeError):
|
||||
@@ -898,28 +1012,42 @@
|
||||
|
||||
|
||||
class GetTypeHintTests(BaseTestCase):
|
||||
+ @classmethod
|
||||
+ def setUpClass(cls):
|
||||
+ with tempfile.TemporaryDirectory() as tempdir:
|
||||
+ sys.path.append(tempdir)
|
||||
+ Path(tempdir, "ann_module.py").write_text(ANN_MODULE_SOURCE)
|
||||
+ Path(tempdir, "ann_module2.py").write_text(ANN_MODULE_2_SOURCE)
|
||||
+ Path(tempdir, "ann_module3.py").write_text(ANN_MODULE_3_SOURCE)
|
||||
+ cls.ann_module = importlib.import_module("ann_module")
|
||||
+ cls.ann_module2 = importlib.import_module("ann_module2")
|
||||
+ cls.ann_module3 = importlib.import_module("ann_module3")
|
||||
+ sys.path.pop()
|
||||
+
|
||||
+ @classmethod
|
||||
+ def tearDownClass(cls):
|
||||
+ for modname in "ann_module", "ann_module2", "ann_module3":
|
||||
+ delattr(cls, modname)
|
||||
+ del sys.modules[modname]
|
||||
+
|
||||
def test_get_type_hints_modules(self):
|
||||
ann_module_type_hints = {1: 2, 'f': Tuple[int, int], 'x': int, 'y': str}
|
||||
- if (TYPING_3_11_0
|
||||
- or (TYPING_3_10_0 and sys.version_info.releaselevel in {'candidate', 'final'})):
|
||||
- # More tests were added in 3.10rc1.
|
||||
- ann_module_type_hints['u'] = int | float
|
||||
- self.assertEqual(gth(ann_module), ann_module_type_hints)
|
||||
- self.assertEqual(gth(ann_module2), {})
|
||||
- self.assertEqual(gth(ann_module3), {})
|
||||
+ self.assertEqual(gth(self.ann_module), ann_module_type_hints)
|
||||
+ self.assertEqual(gth(self.ann_module2), {})
|
||||
+ self.assertEqual(gth(self.ann_module3), {})
|
||||
|
||||
def test_get_type_hints_classes(self):
|
||||
- self.assertEqual(gth(ann_module.C, ann_module.__dict__),
|
||||
- {'y': Optional[ann_module.C]})
|
||||
- self.assertIsInstance(gth(ann_module.j_class), dict)
|
||||
- self.assertEqual(gth(ann_module.M), {'123': 123, 'o': type})
|
||||
- self.assertEqual(gth(ann_module.D),
|
||||
- {'j': str, 'k': str, 'y': Optional[ann_module.C]})
|
||||
- self.assertEqual(gth(ann_module.Y), {'z': int})
|
||||
- self.assertEqual(gth(ann_module.h_class),
|
||||
- {'y': Optional[ann_module.C]})
|
||||
- self.assertEqual(gth(ann_module.S), {'x': str, 'y': str})
|
||||
- self.assertEqual(gth(ann_module.foo), {'x': int})
|
||||
+ self.assertEqual(gth(self.ann_module.C, self.ann_module.__dict__),
|
||||
+ {'y': Optional[self.ann_module.C]})
|
||||
+ self.assertIsInstance(gth(self.ann_module.j_class), dict)
|
||||
+ self.assertEqual(gth(self.ann_module.M), {'123': 123, 'o': type})
|
||||
+ self.assertEqual(gth(self.ann_module.D),
|
||||
+ {'j': str, 'k': str, 'y': Optional[self.ann_module.C]})
|
||||
+ self.assertEqual(gth(self.ann_module.Y), {'z': int})
|
||||
+ self.assertEqual(gth(self.ann_module.h_class),
|
||||
+ {'y': Optional[self.ann_module.C]})
|
||||
+ self.assertEqual(gth(self.ann_module.S), {'x': str, 'y': str})
|
||||
+ self.assertEqual(gth(self.ann_module.foo), {'x': int})
|
||||
self.assertEqual(gth(NoneAndForward, globals()),
|
||||
{'parent': NoneAndForward, 'meaning': type(None)})
|
||||
|
||||
@@ -930,7 +1058,7 @@
|
||||
def __init__(self, x: 'not a type'): ... # noqa
|
||||
self.assertTrue(NoTpCheck.__no_type_check__)
|
||||
self.assertTrue(NoTpCheck.Inn.__init__.__no_type_check__)
|
||||
- self.assertEqual(gth(ann_module2.NTC.meth), {})
|
||||
+ self.assertEqual(gth(self.ann_module2.NTC.meth), {})
|
||||
class ABase(Generic[T]):
|
||||
def meth(x: int): ...
|
||||
@no_type_check
|
||||
@@ -938,8 +1066,8 @@
|
||||
self.assertEqual(gth(ABase.meth), {'x': int})
|
||||
|
||||
def test_get_type_hints_ClassVar(self):
|
||||
- self.assertEqual(gth(ann_module2.CV, ann_module2.__dict__),
|
||||
- {'var': ClassVar[ann_module2.CV]})
|
||||
+ self.assertEqual(gth(self.ann_module2.CV, self.ann_module2.__dict__),
|
||||
+ {'var': ClassVar[self.ann_module2.CV]})
|
||||
self.assertEqual(gth(B, globals()),
|
||||
{'y': int, 'x': ClassVar[Optional[B]], 'b': int})
|
||||
self.assertEqual(gth(CSub, globals()),
|
||||
@ -1,12 +1,11 @@
|
||||
%global _empty_manifest_terminate_build 0
|
||||
Name: python-typing-extensions
|
||||
Version: 4.10.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Backported and Experimental Type Hints for Python 3.5+
|
||||
License: PSF-2.0
|
||||
URL: https://github.com/python/typing/blob/master/typing_extensions/README.rst
|
||||
Source0: https://files.pythonhosted.org/packages/16/3a/0d26ce356c7465a19c9ea8814b960f8a36c3b0d07c323176620b7b483e44/typing_extensions-4.10.0.tar.gz
|
||||
patch0: Make-tests-pass-on-conda-builds.patch
|
||||
BuildArch: noarch
|
||||
%description
|
||||
Typing Extensions - Backported and Experimental Type Hints for Python.
|
||||
@ -84,6 +83,9 @@ cd src
|
||||
%{_docdir}/*
|
||||
|
||||
%changelog
|
||||
* Mon Mar 4 2024 Han Guangyu <hanguangyu@uniontech.com> - 4.10.0-2
|
||||
- Remove unused `Make-tests-pass-on-conda-builds.patch` to fix ci_failed.
|
||||
|
||||
* Mon Mar 4 2024 Dongxing Wang <dongxing.wang_a@thundersoft.com> - 4.10.0-1
|
||||
- Update package with version 4.10.0
|
||||
Add support for PEP 728, PEP 742
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user