kennethreitz/pipenv
1
0
Fork 0
mirror of https://github.com/kennethreitz/pipenv.git synced 2026-06-05 14:50:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typing extensions (#5684)

Browse Source 
* Fix typing_extensions which is already provided by pip was not being imported correctly.

* Add the directory with typing_extensions back to the PATH
This commit is contained in:
Matt Davis
2023-05-12 07:58:34 -04:00
committed by GitHub
parent 2ff8af5817
commit 88f030e00b
24 changed files with 33 additions and 2590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pipenv/__init__.py
+4 -2
View File
@@ -4,6 +4,7 @@
# |
import os
import sys
import warnings
from pipenv.__version__ import __version__ # noqa
@@ -12,11 +13,12 @@ from pipenv.patched.pip._vendor.urllib3.exceptions import DependencyWarning
warnings.filterwarnings("ignore", category=DependencyWarning)
warnings.filterwarnings("ignore", category=ResourceWarning)
warnings.filterwarnings("ignore", category=UserWarning)
PIPENV_ROOT = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
PIP_VENDOR = os.sep.join([PIPENV_ROOT, "patched", "pip", "_vendor"])
# Load patched pip instead of system pip
os.environ["PIP_DISABLE_PIP_VERSION_CHECK"] = "1"
sys.path.insert(0, PIP_VENDOR)
if os.name == "nt":
from pipenv.vendor import colorama
pipenv/vendor/click/core.py
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ from .utils import make_str
from .utils import PacifyFlushWrapper
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
from .shell_completion import CompletionItem
F = t.TypeVar("F", bound=t.Callable[..., t.Any])
pipenv/vendor/click/globals.py
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ import typing as t
from threading import local
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
from .core import Context
_local = local()
pipenv/vendor/click/parser.py
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ from .exceptions import NoSuchOption
from .exceptions import UsageError
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
from .core import Argument as CoreArgument
from .core import Context
from .core import Option as CoreOption
pipenv/vendor/click/types.py
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ from .utils import LazyFile
from .utils import safecall
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
from .core import Context
from .core import Parameter
from .shell_completion import CompletionItem
pipenv/vendor/click/utils.py
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ from ._compat import WIN
from .globals import resolve_color_default
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
F = t.TypeVar("F", bound=t.Callable[..., t.Any])
pipenv/vendor/markupsafe/__init__.py
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ import string
import typing as t
if t.TYPE_CHECKING:
import pipenv.vendor.typing_extensions as te
from pipenv.patched.pip._vendor import typing_extensions as te
class HasHTML(te.Protocol):
def __html__(self) -> str:
pipenv/vendor/pydantic/annotated_types.py
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ from .main import BaseModel, create_model
from .typing import is_typeddict, is_typeddict_special
if TYPE_CHECKING:
from pipenv.vendor.typing_extensions import TypedDict
from pipenv.patched.pip._vendor.typing_extensions import TypedDict
if sys.version_info < (3, 11):
pipenv/vendor/pydantic/config.py
Vendored
+2 -2
View File
@@ -2,7 +2,7 @@ import json
from enum import Enum
from typing import TYPE_CHECKING, Any, Callable, Dict, ForwardRef, Optional, Tuple, Type, Union
from pipenv.vendor.typing_extensions import Literal, Protocol
from pipenv.patched.pip._vendor.typing_extensions import Literal, Protocol
from .typing import AnyArgTCallable, AnyCallable
from .utils import GetterDict
@@ -40,7 +40,7 @@ class Extra(str, Enum):
# https://github.com/cython/cython/issues/4003
# Will be fixed with Cython 3 but still in alpha right now
if not compiled:
from pipenv.vendor.typing_extensions import TypedDict
from pipenv.patched.pip._vendor.typing_extensions import TypedDict
class ConfigDict(TypedDict, total=False):
title: Optional[str]
pipenv/vendor/pydantic/dataclasses.py
Vendored
+1 -1
View File
@@ -38,7 +38,7 @@ from contextlib import contextmanager
from functools import wraps
from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, Generator, Optional, Type, TypeVar, Union, overload
from pipenv.vendor.typing_extensions import dataclass_transform
from pipenv.patched.pip._vendor.typing_extensions import dataclass_transform
from .class_validators import gather_all_validators
from .config import BaseConfig, ConfigDict, Extra, get_config
pipenv/vendor/pydantic/error_wrappers.py
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ from .json import pydantic_encoder
from .utils import Representation
if TYPE_CHECKING:
from pipenv.vendor.typing_extensions import TypedDict
from pipenv.patched.pip._vendor.typing_extensions import TypedDict
from .config import BaseConfig
from .types import ModelOrDc
pipenv/vendor/pydantic/fields.py
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ from typing import (
Union,
)
from pipenv.vendor.typing_extensions import Annotated, Final
from pipenv.patched.pip._vendor.typing_extensions import Annotated, Final
from . import errors as errors_
from .class_validators import Validator, make_generic_validator, prep_validators
pipenv/vendor/pydantic/generics.py
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ from typing import (
)
from weakref import WeakKeyDictionary, WeakValueDictionary
from pipenv.vendor.typing_extensions import Annotated
from pipenv.patched.pip._vendor.typing_extensions import Annotated
from .class_validators import gather_all_validators
from .fields import DeferredType
pipenv/vendor/pydantic/main.py
Vendored
+1 -1
View File
@@ -24,7 +24,7 @@ from typing import (
overload,
)
from pipenv.vendor.typing_extensions import dataclass_transform
from pipenv.patched.pip._vendor.typing_extensions import dataclass_transform
from .class_validators import ValidatorGroup, extract_root_validators, extract_validators, inherit_validators
from .config import BaseConfig, Extra, inherit_config, prepare_config
pipenv/vendor/pydantic/networks.py
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ from .validators import constr_length_validator, str_validator
if TYPE_CHECKING:
import email_validator
from pipenv.vendor.typing_extensions import TypedDict
from pipenv.patched.pip._vendor.typing_extensions import TypedDict
from .config import BaseConfig
from .fields import ModelField
pipenv/vendor/pydantic/schema.py
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ from typing import (
)
from uuid import UUID
from pipenv.vendor.typing_extensions import Annotated, Literal
from pipenv.patched.pip._vendor.typing_extensions import Annotated, Literal
from .fields import (
MAPPING_LIKE_SHAPES,
pipenv/vendor/pydantic/types.py
Vendored
+1 -1
View File
@@ -121,7 +121,7 @@ OptionalDate = Optional[date]
StrIntFloat = Union[str, int, float]
if TYPE_CHECKING:
from pipenv.vendor.typing_extensions import Annotated
from pipenv.patched.pip._vendor.typing_extensions import Annotated
from .dataclasses import Dataclass
from .main import BaseModel
pipenv/vendor/pydantic/typing.py
Vendored
+2 -2
View File
@@ -26,7 +26,7 @@ from typing import ( # type: ignore
get_type_hints,
)
from pipenv.vendor.typing_extensions import (
from pipenv.patched.pip._vendor.typing_extensions import (
Annotated,
Final,
Literal,
@@ -186,7 +186,7 @@ if sys.version_info < (3, 9):
else:
from typing import _UnionGenericAlias # type: ignore
from pipenv.vendor.typing_extensions import _AnnotatedAlias
from pipenv.patched.pip._vendor.typing_extensions import _AnnotatedAlias
def convert_generics(tp: Type[Any]) -> Type[Any]:
"""
pipenv/vendor/pydantic/utils.py
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ from typing import (
Union,
)
from pipenv.vendor.typing_extensions import Annotated
from pipenv.patched.pip._vendor.typing_extensions import Annotated
from .errors import ConfigError
from .typing import (
pipenv/vendor/pydantic/validators.py
Vendored
+1 -1
View File
@@ -44,7 +44,7 @@ from .typing import (
from .utils import almost_equal_floats, lenient_issubclass, sequence_like
if TYPE_CHECKING:
from pipenv.vendor.typing_extensions import Literal, TypedDict
from pipenv.patched.pip._vendor.typing_extensions import Literal, TypedDict
from .config import BaseConfig
from .fields import ModelField
pipenv/vendor/typing_extensions.LICENSE
Vendored
-254
View File
@@ -1,254 +0,0 @@
A. HISTORY OF THE SOFTWARE
==========================
Python was created in the early 1990s by Guido van Rossum at Stichting
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
as a successor of a language called ABC. Guido remains Python's
principal author, although it includes many contributions from others.
In 1995, Guido continued his work on Python at the Corporation for
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
in Reston, Virginia where he released several versions of the
software.
In May 2000, Guido and the Python core development team moved to
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
year, the PythonLabs team moved to Digital Creations, which became
Zope Corporation. In 2001, the Python Software Foundation (PSF, see
https://www.python.org/psf/) was formed, a non-profit organization
created specifically to own Python-related Intellectual Property.
Zope Corporation was a sponsoring member of the PSF.
All Python releases are Open Source (see http://www.opensource.org for
the Open Source Definition). Historically, most, but not all, Python
releases have also been GPL-compatible; the table below summarizes
the various releases.
Release Derived Year Owner GPL-
from compatible? (1)
0.9.0 thru 1.2 1991-1995 CWI yes
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
1.6 1.5.2 2000 CNRI no
2.0 1.6 2000 BeOpen.com no
1.6.1 1.6 2001 CNRI yes (2)
2.1 2.0+1.6.1 2001 PSF no
2.0.1 2.0+1.6.1 2001 PSF yes
2.1.1 2.1+2.0.1 2001 PSF yes
2.1.2 2.1.1 2002 PSF yes
2.1.3 2.1.2 2002 PSF yes
2.2 and above 2.1.1 2001-now PSF yes
Footnotes:
(1) GPL-compatible doesn't mean that we're distributing Python under
the GPL. All Python licenses, unlike the GPL, let you distribute
a modified version without making your changes open source. The
GPL-compatible licenses make it possible to combine Python with
other software that is released under the GPL; the others don't.
(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
because its license has a choice of law clause. According to
CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
is "not incompatible" with the GPL.
Thanks to the many outside volunteers who have worked under Guido's
direction to make these releases possible.
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
===============================================================
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
--------------------------------------------
1. This LICENSE AGREEMENT is between the Python Software Foundation
("PSF"), and the Individual or Organization ("Licensee") accessing and
otherwise using this software ("Python") in source or binary form and
its associated documentation.
2. Subject to the terms and conditions of this License Agreement, PSF hereby
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright,
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Python Software Foundation;
All Rights Reserved" are retained in Python alone or in any derivative version
prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python.
4. PSF is making Python available to Licensee on an "AS IS"
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. Nothing in this License Agreement shall be deemed to create any
relationship of agency, partnership, or joint venture between PSF and
Licensee. This License Agreement does not grant permission to use PSF
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
8. By copying, installing or otherwise using Python, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
Individual or Organization ("Licensee") accessing and otherwise using
this software in source or binary form and its associated
documentation ("the Software").
2. Subject to the terms and conditions of this BeOpen Python License
Agreement, BeOpen hereby grants Licensee a non-exclusive,
royalty-free, world-wide license to reproduce, analyze, test, perform
and/or display publicly, prepare derivative works, distribute, and
otherwise use the Software alone or in any derivative version,
provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee.
3. BeOpen is making the Software available to Licensee on an "AS IS"
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
5. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
6. This License Agreement shall be governed by and interpreted in all
respects by the law of the State of California, excluding conflict of
law provisions. Nothing in this License Agreement shall be deemed to
create any relationship of agency, partnership, or joint venture
between BeOpen and Licensee. This License Agreement does not grant
permission to use BeOpen trademarks or trade names in a trademark
sense to endorse or promote products or services of Licensee, or any
third party. As an exception, the "BeOpen Python" logos available at
http://www.pythonlabs.com/logos.html may be used according to the
permissions granted on that web page.
7. By copying, installing or otherwise using the software, Licensee
agrees to be bound by the terms and conditions of this License
Agreement.
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
---------------------------------------
1. This LICENSE AGREEMENT is between the Corporation for National
Research Initiatives, having an office at 1895 Preston White Drive,
Reston, VA 20191 ("CNRI"), and the Individual or Organization
("Licensee") accessing and otherwise using Python 1.6.1 software in
source or binary form and its associated documentation.
2. Subject to the terms and conditions of this License Agreement, CNRI
hereby grants Licensee a nonexclusive, royalty-free, world-wide
license to reproduce, analyze, test, perform and/or display publicly,
prepare derivative works, distribute, and otherwise use Python 1.6.1
alone or in any derivative version, provided, however, that CNRI's
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
1995-2001 Corporation for National Research Initiatives; All Rights
Reserved" are retained in Python 1.6.1 alone or in any derivative
version prepared by Licensee. Alternately, in lieu of CNRI's License
Agreement, Licensee may substitute the following text (omitting the
quotes): "Python 1.6.1 is made available subject to the terms and
conditions in CNRI's License Agreement. This Agreement together with
Python 1.6.1 may be located on the internet using the following
unique, persistent identifier (known as a handle): 1895.22/1013. This
Agreement may also be obtained from a proxy server on the internet
using the following URL: http://hdl.handle.net/1895.22/1013".
3. In the event Licensee prepares a derivative work that is based on
or incorporates Python 1.6.1 or any part thereof, and wants to make
the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
the changes made to Python 1.6.1.
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
INFRINGE ANY THIRD PARTY RIGHTS.
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
breach of its terms and conditions.
7. This License Agreement shall be governed by the federal
intellectual property law of the United States, including without
limitation the federal copyright law, and, to the extent such
U.S. federal law does not apply, by the law of the Commonwealth of
Virginia, excluding Virginia's conflict of law provisions.
Notwithstanding the foregoing, with regard to derivative works based
on Python 1.6.1 that incorporate non-separable material that was
previously distributed under the GNU General Public License (GPL), the
law of the Commonwealth of Virginia shall govern this License
Agreement only as to issues arising under or with respect to
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
License Agreement shall be deemed to create any relationship of
agency, partnership, or joint venture between CNRI and Licensee. This
License Agreement does not grant permission to use CNRI trademarks or
trade name in a trademark sense to endorse or promote products or
services of Licensee, or any third party.
8. By clicking on the "ACCEPT" button where indicated, or by copying,
installing or otherwise using Python 1.6.1, Licensee agrees to be
bound by the terms and conditions of this License Agreement.
ACCEPT
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
The Netherlands. All rights reserved.
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Stichting Mathematisch
Centrum or CWI not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior
permission.
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
pipenv/vendor/typing_extensions.py
Vendored
-2312
View File
File diff suppressed because it is too large Load Diff
pipenv/vendor/vendor.txt
Vendored
-1
View File
@@ -18,4 +18,3 @@ ruamel.yaml==0.17.21
shellingham==1.5.0.post1
toml==0.10.2
tomlkit==0.11.7
typing-extensions==4.5.0
tasks/vendoring/__init__.py
+8
View File
@@ -98,6 +98,14 @@ GLOBAL_REPLACEMENT = [
"from pipenv.patched.pip._vendor.distlib.metadata import",
),
("from distlib.wheel import", "from pipenv.patched.pip._vendor.distlib.wheel import"),
(
"from typing_extensions import",
"from pipenv.patched.pip._vendor.typing_extensions import",
),
(
"from pipenv.patched.pip._vendor.typing_extensions",
"from pipenv.patched.pip._vendor.typing_extensions",
),
]