diff options
author | Stéphane Bidoul <stephane.bidoul@gmail.com> | 2021-04-17 16:27:56 +0200 |
---|---|---|
committer | Stéphane Bidoul <stephane.bidoul@gmail.com> | 2021-04-17 16:27:56 +0200 |
commit | 7bea3ec262df2e98b5eb64baf506a51f1be73136 (patch) | |
tree | 08639d0cca95575a26bf098c1897bdbdfff4fbcb | |
parent | bae5084d627eb4cdabe07c1e743e3d97425d7f5c (diff) | |
download | pip-7bea3ec262df2e98b5eb64baf506a51f1be73136.tar.gz |
Upgrade pep517 to 0.10.0
-rw-r--r-- | news/pep517.vendor.rst | 1 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/__init__.py | 2 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/build.py | 3 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/check.py | 3 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/in_process/__init__.py | 17 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/in_process/_in_process.py (renamed from src/pip/_vendor/pep517/_in_process.py) | 0 | ||||
-rw-r--r-- | src/pip/_vendor/pep517/wrappers.py | 13 | ||||
-rw-r--r-- | src/pip/_vendor/resolvelib.pyi | 1 | ||||
-rw-r--r-- | src/pip/_vendor/vendor.txt | 2 |
9 files changed, 29 insertions, 13 deletions
diff --git a/news/pep517.vendor.rst b/news/pep517.vendor.rst new file mode 100644 index 000000000..f9ddefc00 --- /dev/null +++ b/news/pep517.vendor.rst @@ -0,0 +1 @@ +Upgrade pep517 to 0.10.0 diff --git a/src/pip/_vendor/pep517/__init__.py b/src/pip/_vendor/pep517/__init__.py index 10687486e..3b07c639c 100644 --- a/src/pip/_vendor/pep517/__init__.py +++ b/src/pip/_vendor/pep517/__init__.py @@ -1,6 +1,6 @@ """Wrappers to build Python packages using PEP 517 hooks """ -__version__ = '0.9.1' +__version__ = '0.10.0' from .wrappers import * # noqa: F401, F403 diff --git a/src/pip/_vendor/pep517/build.py b/src/pip/_vendor/pep517/build.py index 264301447..f884bcf10 100644 --- a/src/pip/_vendor/pep517/build.py +++ b/src/pip/_vendor/pep517/build.py @@ -110,6 +110,9 @@ parser.add_argument( def main(args): + log.warning('pep517.build is deprecated. ' + 'Consider switching to https://pypi.org/project/build/') + # determine which dists to build dists = list(filter(None, ( 'sdist' if args.source or not args.binary else None, diff --git a/src/pip/_vendor/pep517/check.py b/src/pip/_vendor/pep517/check.py index 13e722a37..decab8a34 100644 --- a/src/pip/_vendor/pep517/check.py +++ b/src/pip/_vendor/pep517/check.py @@ -167,6 +167,9 @@ def check(source_dir): def main(argv=None): + log.warning('pep517.check is deprecated. ' + 'Consider switching to https://pypi.org/project/build/') + ap = argparse.ArgumentParser() ap.add_argument( 'source_dir', diff --git a/src/pip/_vendor/pep517/in_process/__init__.py b/src/pip/_vendor/pep517/in_process/__init__.py new file mode 100644 index 000000000..c932313b3 --- /dev/null +++ b/src/pip/_vendor/pep517/in_process/__init__.py @@ -0,0 +1,17 @@ +"""This is a subpackage because the directory is on sys.path for _in_process.py + +The subpackage should stay as empty as possible to avoid shadowing modules that +the backend might import. +""" +from os.path import dirname, abspath, join as pjoin +from contextlib import contextmanager + +try: + import importlib.resources as resources + + def _in_proc_script_path(): + return resources.path(__package__, '_in_process.py') +except ImportError: + @contextmanager + def _in_proc_script_path(): + yield pjoin(dirname(abspath(__file__)), '_in_process.py') diff --git a/src/pip/_vendor/pep517/_in_process.py b/src/pip/_vendor/pep517/in_process/_in_process.py index a536b03e6..a536b03e6 100644 --- a/src/pip/_vendor/pep517/_in_process.py +++ b/src/pip/_vendor/pep517/in_process/_in_process.py diff --git a/src/pip/_vendor/pep517/wrappers.py b/src/pip/_vendor/pep517/wrappers.py index d6338ea52..00974aa8b 100644 --- a/src/pip/_vendor/pep517/wrappers.py +++ b/src/pip/_vendor/pep517/wrappers.py @@ -1,13 +1,14 @@ import threading from contextlib import contextmanager import os -from os.path import dirname, abspath, join as pjoin +from os.path import abspath, join as pjoin import shutil from subprocess import check_call, check_output, STDOUT import sys from tempfile import mkdtemp from . import compat +from .in_process import _in_proc_script_path __all__ = [ 'BackendUnavailable', @@ -19,16 +20,6 @@ __all__ = [ 'Pep517HookCaller', ] -try: - import importlib.resources as resources - - def _in_proc_script_path(): - return resources.path(__package__, '_in_process.py') -except ImportError: - @contextmanager - def _in_proc_script_path(): - yield pjoin(dirname(abspath(__file__)), '_in_process.py') - @contextmanager def tempdir(): diff --git a/src/pip/_vendor/resolvelib.pyi b/src/pip/_vendor/resolvelib.pyi new file mode 100644 index 000000000..b4ef4e108 --- /dev/null +++ b/src/pip/_vendor/resolvelib.pyi @@ -0,0 +1 @@ +from resolvelib import *
\ No newline at end of file diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt index ce4c73e1d..713f42d4e 100644 --- a/src/pip/_vendor/vendor.txt +++ b/src/pip/_vendor/vendor.txt @@ -6,7 +6,7 @@ distro==1.5.0 html5lib==1.1 msgpack==1.0.2 packaging==20.9 -pep517==0.9.1 +pep517==0.10.0 progress==1.5 pyparsing==2.4.7 requests==2.25.1 |