From 6ddef4333d52afbccfa0ac2e37179d5121225107 Mon Sep 17 00:00:00 2001 From: Avasam Date: Mon, 22 Jul 2024 07:23:39 -0400 Subject: [PATCH] Bump setuptools to 71.1.* and mark `pkg_resources` as obsolete (#12397) --- stubs/setuptools/METADATA.toml | 6 +++++- stubs/setuptools/pkg_resources/__init__.pyi | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stubs/setuptools/METADATA.toml b/stubs/setuptools/METADATA.toml index ca942e240..6d0e2c464 100644 --- a/stubs/setuptools/METADATA.toml +++ b/stubs/setuptools/METADATA.toml @@ -1,5 +1,9 @@ -version = "71.0.*" +version = "71.1.*" upstream_repository = "https://github.com/pypa/setuptools" +extra_description = """\ +If using `setuptools >= 71.1` *only* for `pkg_resources`, +you don't need `types-setuptools` since `pkg_resources` is now typed.\ +""" [tool.stubtest] # darwin is equivalent to linux for OS-specific methods diff --git a/stubs/setuptools/pkg_resources/__init__.pyi b/stubs/setuptools/pkg_resources/__init__.pyi index f4c4c00f9..ea80a85cd 100644 --- a/stubs/setuptools/pkg_resources/__init__.pyi +++ b/stubs/setuptools/pkg_resources/__init__.pyi @@ -1,3 +1,6 @@ +# `pkg_resources` package of `types-setuptools` is now obsolete. +# Changes here should be mirrored to https://github.com/pypa/setuptools/tree/main/pkg_resources + import types import zipimport from _typeshed import BytesPath, Incomplete, StrOrBytesPath, StrPath, Unused