From 3b22ce2fa46f3d1d90ad1ec9b276a8c1bbca0bc1 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Wed, 9 Oct 2019 17:05:48 +0200 Subject: [PATCH] Launch vendoring.update --- .../_vendor/cachecontrol/caches/file_cache.py | 4 +-- ...xtlib2.LICENSE => contextlib2.LICENSE.txt} | 2 ++ src/pip/_vendor/contextlib2.pyi | 1 + src/pip/_vendor/pytoml/LICENSE | 32 +++++++++---------- 4 files changed, 21 insertions(+), 18 deletions(-) rename src/pip/_vendor/{contextlib2.LICENSE => contextlib2.LICENSE.txt} (99%) create mode 100644 src/pip/_vendor/contextlib2.pyi diff --git a/src/pip/_vendor/cachecontrol/caches/file_cache.py b/src/pip/_vendor/cachecontrol/caches/file_cache.py index 1ba00806c..607b94524 100644 --- a/src/pip/_vendor/cachecontrol/caches/file_cache.py +++ b/src/pip/_vendor/cachecontrol/caches/file_cache.py @@ -69,8 +69,8 @@ class FileCache(BaseCache): raise ValueError("Cannot use use_dir_lock and lock_class together") try: - from pip._vendor.lockfile import LockFile - from pip._vendor.lockfile.mkdirlockfile import MkdirLockFile + from lockfile import LockFile + from lockfile.mkdirlockfile import MkdirLockFile except ImportError: notice = dedent( """ diff --git a/src/pip/_vendor/contextlib2.LICENSE b/src/pip/_vendor/contextlib2.LICENSE.txt similarity index 99% rename from src/pip/_vendor/contextlib2.LICENSE rename to src/pip/_vendor/contextlib2.LICENSE.txt index c12b8ab2d..5de20277d 100644 --- a/src/pip/_vendor/contextlib2.LICENSE +++ b/src/pip/_vendor/contextlib2.LICENSE.txt @@ -1,3 +1,5 @@ + + A. HISTORY OF THE SOFTWARE ========================== diff --git a/src/pip/_vendor/contextlib2.pyi b/src/pip/_vendor/contextlib2.pyi new file mode 100644 index 000000000..0d6d6bc48 --- /dev/null +++ b/src/pip/_vendor/contextlib2.pyi @@ -0,0 +1 @@ +from contextlib2 import * \ No newline at end of file diff --git a/src/pip/_vendor/pytoml/LICENSE b/src/pip/_vendor/pytoml/LICENSE index 9739fc67c..da4b10cdc 100644 --- a/src/pip/_vendor/pytoml/LICENSE +++ b/src/pip/_vendor/pytoml/LICENSE @@ -1,16 +1,16 @@ -No-notice MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +No-notice MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -- GitLab