Merge pull request #4624 from pypa/distutils-3dcdf8567

Update distutils
pypa · Sep 2, 2024 · 61f2906 · 61f2906
2 parents bb05063 + 8170b7a
commit 61f2906
Show file tree

Hide file tree

Showing 28 changed files with 4 additions and 4,916 deletions.
diff --git a/newsfragments/4622.bugfix.rst b/newsfragments/4622.bugfix.rst
@@ -0,0 +1 @@
+Merge with pypa/distutils@3dcdf8567, removing the duplicate vendored copy of packaging.
diff --git a/setuptools/_distutils/_msvccompiler.py b/setuptools/_distutils/_msvccompiler.py
@@ -3,8 +3,7 @@
 Contains MSVCCompiler, an implementation of the abstract CCompiler class
 for Microsoft Visual Studio 2015.
 
-The module is compatible with VS 2015 and later. You can find legacy support
-for older versions in distutils.msvc9compiler and distutils.msvccompiler.
+This module requires VS 2015 or later.
 """
 
 # Written by Perry Stoll

diff --git a/setuptools/_distutils/_vendor/__init__.py b/setuptools/_distutils/_vendor/__init__.py
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/INSTALLER b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/INSTALLER
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE.APACHE b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE.APACHE
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE.BSD b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/LICENSE.BSD
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/METADATA b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/METADATA
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/RECORD b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/RECORD
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/REQUESTED b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/REQUESTED
diff --git a/setuptools/_distutils/_vendor/packaging-24.0.dist-info/WHEEL b/setuptools/_distutils/_vendor/packaging-24.0.dist-info/WHEEL
diff --git a/setuptools/_distutils/_vendor/packaging/__init__.py b/setuptools/_distutils/_vendor/packaging/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Merge with pypa/distutils@3dcdf8567, removing the duplicate vendored copy of packaging.