Merge pull request #12682 from ichard26/prune-vendoring

pypa · May 14, 2024 · 762faa7 · 762faa7
2 parents 4abdee1 + 692b7f0
commit 762faa7
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 2,172 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -40,7 +40,6 @@ repos:
         'types-docutils==0.20.0.3',
         'types-setuptools==68.2.0.0',
         'types-freezegun==1.1.10',
-        'types-six==1.16.21.9',
         'types-pyyaml==6.0.12.12',
     ]
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -29,8 +29,6 @@ recursive-include src/pip/_vendor py.typed
 recursive-include docs *.css *.py *.rst *.md
 recursive-include docs *.dot *.png
 
-exclude src/pip/_vendor/six
-exclude src/pip/_vendor/six/moves
 recursive-exclude src/pip/_vendor *.pyi
 
 prune .github

diff --git a/news/six.vendor.rst b/news/six.vendor.rst
@@ -0,0 +1 @@
+Remove vendored six.
diff --git a/news/webencodings.vendor.rst b/news/webencodings.vendor.rst
@@ -0,0 +1 @@
+Remove vendored webencodings.
diff --git a/pyproject.toml b/pyproject.toml
@@ -139,15 +139,13 @@ drop = [
 ]
 
 [tool.vendoring.typing-stubs]
-six = ["six.__init__", "six.moves.__init__", "six.moves.configparser"]
 distro = []
 
 [tool.vendoring.license.directories]
 setuptools = "pkg_resources"
 
 [tool.vendoring.license.fallback-urls]
 distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
-webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
 
 ######################################################################################
 # ruff

diff --git a/src/pip/_vendor/__init__.py b/src/pip/_vendor/__init__.py
@@ -63,10 +63,6 @@ def vendored(modulename):
     vendored("colorama")
     vendored("distlib")
     vendored("distro")
-    vendored("six")
-    vendored("six.moves")
-    vendored("six.moves.urllib")
-    vendored("six.moves.urllib.parse")
     vendored("packaging")
     vendored("packaging.version")
     vendored("packaging.specifiers")

diff --git a/src/pip/_vendor/six.LICENSE b/src/pip/_vendor/six.LICENSE