From 4dc9e83ee31ed79f455fb4356e96a253cff83ee6 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 3 Jun 2023 14:42:57 +0300 Subject: [PATCH 1/4] `distutils` package was removed in 3.12 Source: https://github.com/python/cpython/commit/0faa0ba240e815614e5a2900e48007acac41b214 --- stdlib/VERSIONS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/VERSIONS b/stdlib/VERSIONS index 86e8da78677c..f0efb1c08528 100644 --- a/stdlib/VERSIONS +++ b/stdlib/VERSIONS @@ -112,7 +112,7 @@ dbm: 2.7- decimal: 2.7- difflib: 2.7- dis: 2.7- -distutils: 2.7- +distutils: 2.7-3.11 distutils.command.bdist_msi: 2.7-3.10 distutils.command.bdist_wininst: 2.7-3.9 doctest: 2.7- From 2653d047183cb543410173fc21c819e512669ac8 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 3 Jun 2023 15:13:07 +0300 Subject: [PATCH 2/4] Add `types-setuptools` to `babel` and `cffi` --- stubs/babel/METADATA.toml | 2 +- stubs/babel/babel/messages/frontend.pyi | 2 +- stubs/cffi/METADATA.toml | 1 + stubs/cffi/cffi/api.pyi | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stubs/babel/METADATA.toml b/stubs/babel/METADATA.toml index 7dc2c18b494d..a80fc97a8722 100644 --- a/stubs/babel/METADATA.toml +++ b/stubs/babel/METADATA.toml @@ -1,5 +1,5 @@ version = "2.11.*" -requires = ["types-pytz"] +requires = ["types-pytz", "types-setuptools"] obsolete_since = "2.12.1" # Released on 2023-02-28 partial_stub = true diff --git a/stubs/babel/babel/messages/frontend.pyi b/stubs/babel/babel/messages/frontend.pyi index dfc1a1308aa7..6ecf86c657bb 100644 --- a/stubs/babel/babel/messages/frontend.pyi +++ b/stubs/babel/babel/messages/frontend.pyi @@ -1,6 +1,6 @@ import abc from _typeshed import Incomplete -from distutils.cmd import Command as _Command +from setuptools._distutils.cmd import Command as _Command from typing import Any def listify_value(arg, split: Incomplete | None = None): ... diff --git a/stubs/cffi/METADATA.toml b/stubs/cffi/METADATA.toml index e7239b079805..3a9cb22e1ba8 100644 --- a/stubs/cffi/METADATA.toml +++ b/stubs/cffi/METADATA.toml @@ -1,4 +1,5 @@ version = "1.15.*" +requires = ["types-setuptools"] [tool.stubtest] # linux and darwin are mostly equivalent, except for a single `RTLD_DEEPBIND` variable diff --git a/stubs/cffi/cffi/api.pyi b/stubs/cffi/cffi/api.pyi index 770751128e20..ae723af160e2 100644 --- a/stubs/cffi/cffi/api.pyi +++ b/stubs/cffi/cffi/api.pyi @@ -1,4 +1,4 @@ -import distutils.core +from setuptools._distutils.core import Extension import sys import types from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer @@ -93,7 +93,7 @@ class FFI: def set_source_pkgconfig( self, module_name: str, pkgconfig_libs: list[str], source: str, source_extension: str = ".c", **kwds: Any ) -> None: ... - def distutils_extension(self, tmpdir: str = "build", verbose: bool = True) -> distutils.core.Extension: ... + def distutils_extension(self, tmpdir: str = "build", verbose: bool = True) -> Extension: ... def emit_c_code(self, filename: str) -> None: ... def emit_python_code(self, filename: str) -> None: ... def compile(self, tmpdir: str = ".", verbose: int = 0, target: str | None = None, debug: bool | None = None) -> str: ... From b2e8026b7c24e307db4e244ce5e308d5846a42a2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 3 Jun 2023 12:14:38 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stubs/babel/babel/messages/frontend.pyi | 3 ++- stubs/cffi/cffi/api.pyi | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/stubs/babel/babel/messages/frontend.pyi b/stubs/babel/babel/messages/frontend.pyi index 6ecf86c657bb..c20579b48e6e 100644 --- a/stubs/babel/babel/messages/frontend.pyi +++ b/stubs/babel/babel/messages/frontend.pyi @@ -1,8 +1,9 @@ import abc from _typeshed import Incomplete -from setuptools._distutils.cmd import Command as _Command from typing import Any +from setuptools._distutils.cmd import Command as _Command + def listify_value(arg, split: Incomplete | None = None): ... class Command(_Command, metaclass=abc.ABCMeta): diff --git a/stubs/cffi/cffi/api.pyi b/stubs/cffi/cffi/api.pyi index ae723af160e2..d2633bdef420 100644 --- a/stubs/cffi/cffi/api.pyi +++ b/stubs/cffi/cffi/api.pyi @@ -1,4 +1,3 @@ -from setuptools._distutils.core import Extension import sys import types from _typeshed import Incomplete, ReadableBuffer, WriteableBuffer @@ -7,6 +6,7 @@ from typing import Any, TypeVar, overload from typing_extensions import Literal, TypeAlias import _cffi_backend +from setuptools._distutils.core import Extension _T = TypeVar("_T") From 6a7128bfca01e6a3c20cd0371e92e8256eac15ed Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Sat, 3 Jun 2023 13:42:51 +0100 Subject: [PATCH 4/4] import from a file typeshed has stubs for --- stubs/cffi/cffi/api.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubs/cffi/cffi/api.pyi b/stubs/cffi/cffi/api.pyi index d2633bdef420..85478ce662c0 100644 --- a/stubs/cffi/cffi/api.pyi +++ b/stubs/cffi/cffi/api.pyi @@ -6,7 +6,7 @@ from typing import Any, TypeVar, overload from typing_extensions import Literal, TypeAlias import _cffi_backend -from setuptools._distutils.core import Extension +from setuptools._distutils.extension import Extension _T = TypeVar("_T")