mirror of
https://github.com/kennethreitz/pipenv.git
synced 2026-06-05 22:50:18 +00:00
Remove vendored cached_property (#5249)
The class cached_property is available in the Python STL from version 3.8 onwards. In addition, it is redifend in included libraries so we can just use it from there.
This commit is contained in:
Oz N Tiram
@@ -22,7 +22,14 @@ from pipenv.utils.indexes import prepare_pip_source_args
|
||||
from pipenv.utils.processes import subprocess_run
|
||||
from pipenv.utils.shell import make_posix, normalize_path
|
||||
from pipenv.vendor import click, vistir
|
||||
from pipenv.vendor.cached_property import cached_property
|
||||
|
||||
try:
|
||||
# this is only in Python3.8 and later
|
||||
from functools import cached_property
|
||||
except ImportError:
|
||||
# eventually distlib will remove cached property when they drop Python3.7
|
||||
from pipenv.patched.pip._vendor.distlib.util import cached_property
|
||||
|
||||
|
||||
if is_type_checking():
|
||||
from types import ModuleType
|
||||
|
||||
+8
-1
@@ -42,9 +42,16 @@ from pipenv.utils.shell import (
|
||||
system_which,
|
||||
)
|
||||
from pipenv.utils.toml import cleanup_toml, convert_toml_outline_tables
|
||||
from pipenv.vendor.cached_property import cached_property
|
||||
from pipenv.vendor.requirementslib.models.utils import get_default_pyproject_backend
|
||||
|
||||
try:
|
||||
# this is only in Python3.8 and later
|
||||
from functools import cached_property
|
||||
except ImportError:
|
||||
# eventually distlib will remove cached property when they drop Python3.7
|
||||
from pipenv.patched.pip._vendor.distlib.util import cached_property
|
||||
|
||||
|
||||
if is_type_checking():
|
||||
from typing import Dict, List, Optional, Set, Text, Tuple, Union
|
||||
|
||||
|
||||
@@ -25,13 +25,19 @@ from pipenv.patched.pip._internal.utils.hashes import FAVORITE_HASH
|
||||
from pipenv.patched.pip._internal.utils.temp_dir import global_tempdir_manager
|
||||
from pipenv.project import Project
|
||||
from pipenv.vendor import click
|
||||
from pipenv.vendor.cached_property import cached_property
|
||||
from pipenv.vendor.requirementslib import Pipfile, Requirement
|
||||
from pipenv.vendor.requirementslib.models.requirements import Line
|
||||
from pipenv.vendor.requirementslib.models.utils import DIRECT_URL_RE
|
||||
from pipenv.vendor.vistir import TemporaryDirectory, open_file
|
||||
from pipenv.vendor.vistir.path import create_tracked_tempdir
|
||||
|
||||
try:
|
||||
# this is only in Python3.8 and later
|
||||
from functools import cached_property
|
||||
except ImportError:
|
||||
# eventually distlib will remove cached property when they drop Python3.7
|
||||
from pipenv.patched.pip._vendor.distlib.util import cached_property
|
||||
|
||||
from .dependencies import (
|
||||
HackedPythonVersion,
|
||||
clean_pkg_version,
|
||||
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
Copyright (c) 2015, Daniel Greenfeld
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of cached-property nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
Copyright (c) 2015, Daniel Greenfeld
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
||||
|
||||
* Neither the name of cached-property nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
Vendored
-153
@@ -1,153 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
__author__ = "Daniel Greenfeld"
|
||||
__email__ = "pydanny@gmail.com"
|
||||
__version__ = "1.5.2"
|
||||
__license__ = "BSD"
|
||||
|
||||
from functools import wraps
|
||||
from time import time
|
||||
import threading
|
||||
|
||||
try:
|
||||
import asyncio
|
||||
except (ImportError, SyntaxError):
|
||||
asyncio = None
|
||||
|
||||
|
||||
class cached_property(object):
|
||||
"""
|
||||
A property that is only computed once per instance and then replaces itself
|
||||
with an ordinary attribute. Deleting the attribute resets the property.
|
||||
Source: https://github.com/bottlepy/bottle/commit/fa7733e075da0d790d809aa3d2f53071897e6f76
|
||||
""" # noqa
|
||||
|
||||
def __init__(self, func):
|
||||
self.__doc__ = getattr(func, "__doc__")
|
||||
self.func = func
|
||||
|
||||
def __get__(self, obj, cls):
|
||||
if obj is None:
|
||||
return self
|
||||
|
||||
if asyncio and asyncio.iscoroutinefunction(self.func):
|
||||
return self._wrap_in_coroutine(obj)
|
||||
|
||||
value = obj.__dict__[self.func.__name__] = self.func(obj)
|
||||
return value
|
||||
|
||||
def _wrap_in_coroutine(self, obj):
|
||||
@wraps(obj)
|
||||
@asyncio.coroutine
|
||||
def wrapper():
|
||||
future = asyncio.ensure_future(self.func(obj))
|
||||
obj.__dict__[self.func.__name__] = future
|
||||
return future
|
||||
|
||||
return wrapper()
|
||||
|
||||
|
||||
class threaded_cached_property(object):
|
||||
"""
|
||||
A cached_property version for use in environments where multiple threads
|
||||
might concurrently try to access the property.
|
||||
"""
|
||||
|
||||
def __init__(self, func):
|
||||
self.__doc__ = getattr(func, "__doc__")
|
||||
self.func = func
|
||||
self.lock = threading.RLock()
|
||||
|
||||
def __get__(self, obj, cls):
|
||||
if obj is None:
|
||||
return self
|
||||
|
||||
obj_dict = obj.__dict__
|
||||
name = self.func.__name__
|
||||
with self.lock:
|
||||
try:
|
||||
# check if the value was computed before the lock was acquired
|
||||
return obj_dict[name]
|
||||
|
||||
except KeyError:
|
||||
# if not, do the calculation and release the lock
|
||||
return obj_dict.setdefault(name, self.func(obj))
|
||||
|
||||
|
||||
class cached_property_with_ttl(object):
|
||||
"""
|
||||
A property that is only computed once per instance and then replaces itself
|
||||
with an ordinary attribute. Setting the ttl to a number expresses how long
|
||||
the property will last before being timed out.
|
||||
"""
|
||||
|
||||
def __init__(self, ttl=None):
|
||||
if callable(ttl):
|
||||
func = ttl
|
||||
ttl = None
|
||||
else:
|
||||
func = None
|
||||
self.ttl = ttl
|
||||
self._prepare_func(func)
|
||||
|
||||
def __call__(self, func):
|
||||
self._prepare_func(func)
|
||||
return self
|
||||
|
||||
def __get__(self, obj, cls):
|
||||
if obj is None:
|
||||
return self
|
||||
|
||||
now = time()
|
||||
obj_dict = obj.__dict__
|
||||
name = self.__name__
|
||||
try:
|
||||
value, last_updated = obj_dict[name]
|
||||
except KeyError:
|
||||
pass
|
||||
else:
|
||||
ttl_expired = self.ttl and self.ttl < now - last_updated
|
||||
if not ttl_expired:
|
||||
return value
|
||||
|
||||
value = self.func(obj)
|
||||
obj_dict[name] = (value, now)
|
||||
return value
|
||||
|
||||
def __delete__(self, obj):
|
||||
obj.__dict__.pop(self.__name__, None)
|
||||
|
||||
def __set__(self, obj, value):
|
||||
obj.__dict__[self.__name__] = (value, time())
|
||||
|
||||
def _prepare_func(self, func):
|
||||
self.func = func
|
||||
if func:
|
||||
self.__doc__ = func.__doc__
|
||||
self.__name__ = func.__name__
|
||||
self.__module__ = func.__module__
|
||||
|
||||
|
||||
# Aliases to make cached_property_with_ttl easier to use
|
||||
cached_property_ttl = cached_property_with_ttl
|
||||
timed_cached_property = cached_property_with_ttl
|
||||
|
||||
|
||||
class threaded_cached_property_with_ttl(cached_property_with_ttl):
|
||||
"""
|
||||
A cached_property version for use in environments where multiple threads
|
||||
might concurrently try to access the property.
|
||||
"""
|
||||
|
||||
def __init__(self, ttl=None):
|
||||
super(threaded_cached_property_with_ttl, self).__init__(ttl)
|
||||
self.lock = threading.RLock()
|
||||
|
||||
def __get__(self, obj, cls):
|
||||
with self.lock:
|
||||
return super(threaded_cached_property_with_ttl, self).__get__(obj, cls)
|
||||
|
||||
|
||||
# Alias to make threaded_cached_property_with_ttl easier to use
|
||||
threaded_cached_property_ttl = threaded_cached_property_with_ttl
|
||||
timed_threaded_cached_property = threaded_cached_property_with_ttl
|
||||
+1
-1
@@ -11,7 +11,7 @@ from itertools import chain
|
||||
|
||||
import pipenv.vendor.attr as attr
|
||||
import pipenv.vendor.six as six
|
||||
from pipenv.vendor.cached_property import cached_property
|
||||
from pipenv.vendor.pyparsing.core import cached_property
|
||||
|
||||
from ..compat import Path, fs_str
|
||||
from ..environment import (
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@ from urllib.parse import unquote
|
||||
|
||||
import pipenv.vendor.attr as attr
|
||||
import pipenv.vendor.pip_shims as pip_shims
|
||||
from pipenv.vendor.cached_property import cached_property
|
||||
from pipenv.vendor.pyparsing.core import cached_property
|
||||
from pipenv.patched.pip._vendor.packaging.markers import Marker
|
||||
from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement
|
||||
from pipenv.patched.pip._vendor.packaging.specifiers import (
|
||||
|
||||
Vendored
-1
@@ -1,6 +1,5 @@
|
||||
appdirs==1.4.4
|
||||
attrs==21.2.0
|
||||
cached-property==1.5.2
|
||||
cerberus==1.3.4
|
||||
click-didyoumean==0.0.3
|
||||
click==8.0.3
|
||||
|
||||
@@ -76,6 +76,10 @@ GLOBAL_REPLACEMENT = [
|
||||
r"(?<!\.)import pep517\.wrappers",
|
||||
r"from pipenv.patched.pip._vendor.pep517 import wrappers",
|
||||
),
|
||||
(
|
||||
r"from cached_property import cached_property",
|
||||
r"from pipenv.vendor.pyparsing.core import cached_property",
|
||||
),
|
||||
(r"(?<!\.)pep517\.envbuild", r"envbuild"),
|
||||
(r"(?<!\.)pep517\.wrappers", r"wrappers"),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user