Skip to content

Commit bc7621a

Browse files
authored
Merge pull request #11997 from pfmoore/vendoring-setuptools
Vendor setuptools 67.7.2
2 parents 51afe45 + cbc92fd commit bc7621a

File tree

5 files changed

+344
-292
lines changed

5 files changed

+344
-292
lines changed

news/setuptools.vendor.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Upgrade setuptools to 67.7.2

src/pip/_internal/cli/main.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import logging
55
import os
66
import sys
7+
import warnings
78
from typing import List, Optional
89

910
from pip._internal.cli.autocompletion import autocomplete
@@ -46,6 +47,14 @@ def main(args: Optional[List[str]] = None) -> int:
4647
if args is None:
4748
args = sys.argv[1:]
4849

50+
# Suppress the pkg_resources deprecation warning
51+
# Note - we use a module of .*pkg_resources to cover
52+
# the normal case (pip._vendor.pkg_resources) and the
53+
# devendored case (a bare pkg_resources)
54+
warnings.filterwarnings(
55+
action="ignore", category=DeprecationWarning, module=".*pkg_resources"
56+
)
57+
4958
# Configure our deprecation warnings to be sent through loggers
5059
deprecation.install_warning_logger()
5160

0 commit comments

Comments
 (0)