From d0ab374a110656ac5127862c256960d49a39c785 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Wed, 27 Jul 2022 20:20:42 -0700 Subject: [PATCH 1/2] Remove Python 2 only stubs --- mypy/stubinfo.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mypy/stubinfo.py b/mypy/stubinfo.py index 943623a6743b..8ad1a117358a 100644 --- a/mypy/stubinfo.py +++ b/mypy/stubinfo.py @@ -31,7 +31,6 @@ def is_legacy_bundled_package(prefix: str, py_version: int) -> bool: "cachetools": StubInfo("types-cachetools"), "chardet": StubInfo("types-chardet"), "click_spinner": StubInfo("types-click-spinner"), - "concurrent": StubInfo("types-futures", py_version=2), "contextvars": StubInfo("types-contextvars", py_version=3), "croniter": StubInfo("types-croniter"), "dataclasses": StubInfo("types-dataclasses", py_version=3), @@ -42,24 +41,18 @@ def is_legacy_bundled_package(prefix: str, py_version: int) -> bool: "deprecated": StubInfo("types-Deprecated"), "docutils": StubInfo("types-docutils", py_version=3), "emoji": StubInfo("types-emoji"), - "enum": StubInfo("types-enum34", py_version=2), - "fb303": StubInfo("types-fb303", py_version=2), "first": StubInfo("types-first"), "geoip2": StubInfo("types-geoip2"), "gflags": StubInfo("types-python-gflags"), "google.protobuf": StubInfo("types-protobuf"), - "ipaddress": StubInfo("types-ipaddress", py_version=2), - "kazoo": StubInfo("types-kazoo", py_version=2), "markdown": StubInfo("types-Markdown"), "maxminddb": StubInfo("types-maxminddb"), "mock": StubInfo("types-mock"), "OpenSSL": StubInfo("types-pyOpenSSL"), "paramiko": StubInfo("types-paramiko"), - "pathlib2": StubInfo("types-pathlib2", py_version=2), "pkg_resources": StubInfo("types-setuptools", py_version=3), "polib": StubInfo("types-polib"), "pycurl": StubInfo("types-pycurl"), - "pymssql": StubInfo("types-pymssql", py_version=2), "pymysql": StubInfo("types-PyMySQL"), "pyrfc3339": StubInfo("types-pyRFC3339", py_version=3), "python2": StubInfo("types-six"), @@ -68,8 +61,6 @@ def is_legacy_bundled_package(prefix: str, py_version: int) -> bool: "redis": StubInfo("types-redis"), "requests": StubInfo("types-requests"), "retry": StubInfo("types-retry"), - "routes": StubInfo("types-Routes", py_version=2), - "scribe": StubInfo("types-scribe", py_version=2), "simplejson": StubInfo("types-simplejson"), "singledispatch": StubInfo("types-singledispatch"), "six": StubInfo("types-six"), @@ -77,7 +68,6 @@ def is_legacy_bundled_package(prefix: str, py_version: int) -> bool: "tabulate": StubInfo("types-tabulate"), "termcolor": StubInfo("types-termcolor"), "toml": StubInfo("types-toml"), - "tornado": StubInfo("types-tornado", py_version=2), "typed_ast": StubInfo("types-typed-ast", py_version=3), "tzlocal": StubInfo("types-tzlocal"), "ujson": StubInfo("types-ujson"), From abf1e545936dff54a330f33610eb15a1c2e3452e Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Wed, 27 Jul 2022 20:39:53 -0700 Subject: [PATCH 2/2] fix test --- mypy/test/teststubinfo.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/mypy/test/teststubinfo.py b/mypy/test/teststubinfo.py index 36c672145382..3ba5c679b655 100644 --- a/mypy/test/teststubinfo.py +++ b/mypy/test/teststubinfo.py @@ -11,8 +11,5 @@ def test_is_legacy_bundled_packages(self) -> None: assert is_legacy_bundled_package("pycurl", 2) assert is_legacy_bundled_package("pycurl", 3) - assert is_legacy_bundled_package("scribe", 2) - assert not is_legacy_bundled_package("scribe", 3) - assert not is_legacy_bundled_package("dataclasses", 2) assert is_legacy_bundled_package("dataclasses", 3)