From fc660d6d4170ce1bcb0a17151f7fa5b21db8fecc Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Tue, 20 Apr 2021 21:55:48 -0700 Subject: [PATCH] Move typing_extensions to stdlib (#5233) I'm not sure what the best way to do this is. This effectively orphans types-typing-extensions, but maybe that's not really a problem. (We can yank the package too) See https://github.com/python/typeshed/pull/5229#issuecomment-822234125 for some details Co-authored-by: hauntsaninja <> --- stdlib/VERSIONS | 1 + {stubs/typing-extensions => stdlib}/typing_extensions.pyi | 0 stubs/Deprecated/METADATA.toml | 2 +- stubs/Jinja2/METADATA.toml | 2 +- stubs/Markdown/METADATA.toml | 2 +- stubs/Werkzeug/METADATA.toml | 2 +- stubs/aiofiles/METADATA.toml | 2 +- stubs/chardet/METADATA.toml | 2 +- stubs/click-spinner/METADATA.toml | 2 +- stubs/nmap/METADATA.toml | 2 +- stubs/pathlib2/METADATA.toml | 2 +- stubs/protobuf/METADATA.toml | 2 +- stubs/pysftp/METADATA.toml | 2 +- stubs/python-dateutil/METADATA.toml | 2 +- stubs/redis/METADATA.toml | 2 +- stubs/typing-extensions/METADATA.toml | 2 -- stubs/waitress/METADATA.toml | 2 +- tests/stubtest_whitelists/py3_common.txt | 1 + 18 files changed, 16 insertions(+), 16 deletions(-) rename {stubs/typing-extensions => stdlib}/typing_extensions.pyi (100%) delete mode 100644 stubs/typing-extensions/METADATA.toml diff --git a/stdlib/VERSIONS b/stdlib/VERSIONS index 11565717c..872219720 100644 --- a/stdlib/VERSIONS +++ b/stdlib/VERSIONS @@ -233,6 +233,7 @@ tty: 2.7 turtle: 2.7 types: 3.6 typing: 3.6 +typing_extensions: 2.7 unicodedata: 2.7 unittest: 3.6 urllib: 3.6 diff --git a/stubs/typing-extensions/typing_extensions.pyi b/stdlib/typing_extensions.pyi similarity index 100% rename from stubs/typing-extensions/typing_extensions.pyi rename to stdlib/typing_extensions.pyi diff --git a/stubs/Deprecated/METADATA.toml b/stubs/Deprecated/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/Deprecated/METADATA.toml +++ b/stubs/Deprecated/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/Jinja2/METADATA.toml b/stubs/Jinja2/METADATA.toml index efb2cd5c3..1d2527760 100644 --- a/stubs/Jinja2/METADATA.toml +++ b/stubs/Jinja2/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-MarkupSafe", "types-typing-extensions"] +requires = ["types-MarkupSafe"] diff --git a/stubs/Markdown/METADATA.toml b/stubs/Markdown/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/Markdown/METADATA.toml +++ b/stubs/Markdown/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/Werkzeug/METADATA.toml b/stubs/Werkzeug/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/Werkzeug/METADATA.toml +++ b/stubs/Werkzeug/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/aiofiles/METADATA.toml b/stubs/aiofiles/METADATA.toml index 1071ae7e9..40f3c61c1 100644 --- a/stubs/aiofiles/METADATA.toml +++ b/stubs/aiofiles/METADATA.toml @@ -1,2 +1,2 @@ version = "0.1" -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/chardet/METADATA.toml b/stubs/chardet/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/chardet/METADATA.toml +++ b/stubs/chardet/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/click-spinner/METADATA.toml b/stubs/click-spinner/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/click-spinner/METADATA.toml +++ b/stubs/click-spinner/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/nmap/METADATA.toml b/stubs/nmap/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/nmap/METADATA.toml +++ b/stubs/nmap/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/pathlib2/METADATA.toml b/stubs/pathlib2/METADATA.toml index 68d729169..ae8bccc93 100644 --- a/stubs/pathlib2/METADATA.toml +++ b/stubs/pathlib2/METADATA.toml @@ -1,4 +1,4 @@ version = "0.1" python2 = true python3 = false -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/protobuf/METADATA.toml b/stubs/protobuf/METADATA.toml index ecb639a2d..c5a20fd36 100644 --- a/stubs/protobuf/METADATA.toml +++ b/stubs/protobuf/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-futures", "types-typing-extensions"] +requires = ["types-futures"] diff --git a/stubs/pysftp/METADATA.toml b/stubs/pysftp/METADATA.toml index 3c94d8e92..c9b2e2d3b 100644 --- a/stubs/pysftp/METADATA.toml +++ b/stubs/pysftp/METADATA.toml @@ -1,3 +1,3 @@ version = "0.2" python2 = true -requires = ["types-typing-extensions", "types-paramiko"] +requires = ["types-paramiko"] diff --git a/stubs/python-dateutil/METADATA.toml b/stubs/python-dateutil/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/python-dateutil/METADATA.toml +++ b/stubs/python-dateutil/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/redis/METADATA.toml b/stubs/redis/METADATA.toml index c2e251758..e43ccaae3 100644 --- a/stubs/redis/METADATA.toml +++ b/stubs/redis/METADATA.toml @@ -1,3 +1,3 @@ version = "0.1" python2 = true -requires = ["types-typing-extensions"] +requires = [] diff --git a/stubs/typing-extensions/METADATA.toml b/stubs/typing-extensions/METADATA.toml deleted file mode 100644 index 9509ba1a7..000000000 --- a/stubs/typing-extensions/METADATA.toml +++ /dev/null @@ -1,2 +0,0 @@ -version = "3.7" -python2 = true diff --git a/stubs/waitress/METADATA.toml b/stubs/waitress/METADATA.toml index 1071ae7e9..40f3c61c1 100644 --- a/stubs/waitress/METADATA.toml +++ b/stubs/waitress/METADATA.toml @@ -1,2 +1,2 @@ version = "0.1" -requires = ["types-typing-extensions"] +requires = [] diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index 39d737c22..32f52fafd 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -307,6 +307,7 @@ collections.abc.* # Types are re-exported from _collections_abc, so errors shou tempfile._TemporaryFileWrapper.[\w_]+ # Various classes in typing aren't types at runtime. In addition, mypy thinks some special forms are tautologically defined. typing.[A-Z]\w+ +typing_extensions\..* # We can't distinguish not having a default value from having a default value of inspect.Parameter.empty inspect.Parameter.__init__ inspect.Signature.__init__