Merge pull request #10035 from hukkin/tomli

news/10034.feature.rst

@@ -0,0 +1 @@
+Support TOML v1.0.0 syntax in ``pyproject.toml``.

src/pip/_internal/pyproject.py

@@ -2,7 +2,7 @@
 from collections import namedtuple
 from typing import Any, List, Optional
 
-from pip._vendor import toml
+from pip._vendor import tomli
 from pip._vendor.packaging.requirements import InvalidRequirement, Requirement
 
 from pip._internal.exceptions import InstallationError
@@ -59,7 +59,7 @@ def load_pyproject_toml(
 
     if has_pyproject:
         with open(pyproject_toml, encoding="utf-8") as f:
-            pp_toml = toml.load(f)
+            pp_toml = tomli.load(f)
         build_system = pp_toml.get("build-system")
     else:
         build_system = None

src/pip/_vendor/README.rst

@@ -16,7 +16,7 @@ Vendoring Policy
   pure Python.
 * Any modifications made to libraries **MUST** be noted in
   ``pip/_vendor/README.rst`` and their corresponding patches **MUST** be
-  included ``tools/automation/vendoring/patches``.
+  included ``tools/vendoring/patches``.
 * Vendored libraries should have corresponding ``vendored()`` entries in
   ``pip/_vendor/__init__.py``.
 
@@ -118,7 +118,7 @@ Automatic Vendoring
 
 Vendoring is automated via the `vendoring <https://pypi.org/project/vendoring/>`_ tool from the content of
 ``pip/_vendor/vendor.txt`` and the different patches in
-``tools/automation/vendoring/patches``.
+``tools/vendoring/patches``.
 Launch it via ``vendoring sync . -v`` (requires ``vendoring>=0.2.2``).
 
 

src/pip/_vendor/__init__.py

@@ -107,7 +107,5 @@ def vendored(modulename):
     vendored("requests.packages.urllib3.util.url")
     vendored("resolvelib")
     vendored("tenacity")
-    vendored("toml")
-    vendored("toml.encoder")
-    vendored("toml.decoder")
+    vendored("tomli")
     vendored("urllib3")

src/pip/_vendor/pep517/build.py

@@ -3,7 +3,7 @@
 import argparse
 import logging
 import os
-from pip._vendor import toml
+import toml
 import shutil
 
 from .envbuild import BuildEnvironment

src/pip/_vendor/pep517/check.py

@@ -4,7 +4,7 @@
 import logging
 import os
 from os.path import isfile, join as pjoin
-from pip._vendor.toml import TomlDecodeError, load as toml_load
+from toml import TomlDecodeError, load as toml_load
 import shutil
 from subprocess import CalledProcessError
 import sys

src/pip/_vendor/pep517/envbuild.py

@@ -3,7 +3,7 @@
 
 import os
 import logging
-from pip._vendor import toml
+import toml
 import shutil
 from subprocess import check_call
 import sys