Merge pull request #4533 from pypa/vendor/update

Update vendored dependencies

docs/advanced.rst

@@ -58,7 +58,6 @@ Alternatively, you can set the ``PIPENV_PYPI_MIRROR`` environment variable.
 ☤ Injecting credentials into Pipfiles via environment variables
 -----------------------------------------------------------------
 
-
 Pipenv will expand environment variables (if defined) in your Pipfile. Quite
 useful if you need to authenticate to a private PyPI::
 
@@ -76,6 +75,17 @@ If your credentials contain a special character, surround the references to the
     [[source]]
     url = "https://$USERNAME:'${PASSWORD}'@mypypi.example.com/simple"
 
+Environment variables may be specified as ``${MY_ENVAR}`` or ``$MY_ENVAR``.
+
+On Windows, ``%MY_ENVAR%`` is supported in addition to ``${MY_ENVAR}`` or ``$MY_ENVAR``.
+
+Environment variables in the URL part of requirement specifiers can also be expanded, where the variable must be in the form of ``${VAR_NAME}``. Neither ``$VAR_NAME`` nor ``%VAR_NAME%`` is acceptable::
+
+    [[package]]
+    requests = {git = "git://${USERNAME}:${PASSWORD}@private.git.com/psf/requests.git", ref = "2.22.0"}
+
+Keep in mind that environment variables are expanded in runtime, leaving the entries in ``Pipfile`` or ``Pipfile.lock`` untouched. This is to avoid the accidental leakage of credentials in the source code.
+
 
 ☤ Specifying Basically Anything
 -------------------------------
@@ -436,32 +446,6 @@ You can then display the names and commands of your shortcuts by running ``pipen
     command   script
     echospam  echo I am really a very silly example
 
-
-☤ Support for Environment Variables
------------------------------------
-
-Pipenv supports the usage of environment variables in place of authentication fragments
-in your Pipfile. These will only be parsed if they are present in the ``[[source]]``
-section. For example:
-
-.. code-block:: toml
-
-    [[source]]
-    url = "https://${PYPI_USERNAME}:${PYPI_PASSWORD}@my_private_repo.example.com/simple"
-    verify_ssl = true
-    name = "pypi"
-
-    [dev-packages]
-
-    [packages]
-    requests = {version="*", index="home"}
-    maya = {version="*", index="pypi"}
-    records = "*"
-
-Environment variables may be specified as ``${MY_ENVAR}`` or ``$MY_ENVAR``.
-
-On Windows, ``%MY_ENVAR%`` is supported in addition to ``${MY_ENVAR}`` or ``$MY_ENVAR``.
-
 .. _configuration-with-environment-variables:
 
 ☤ Configuration With Environment Variables

news/3516.feature.rst

@@ -0,0 +1 @@
+Support expanding environment variables in requirement URLs.

news/4533.vendor.rst

@@ -0,0 +1,25 @@
+Update vendored dependencies:
+- ``colorama`` from ``0.4.3`` to ``0.4.4``
+- ``python-dotenv`` from ``0.10.3`` to ``0.15.0``
+- ``first`` from ``2.0.1`` to ``2.0.2``
+- ``iso8601`` from ``0.1.12`` to ``0.1.13``
+- ``parse`` from ``1.15.0`` to ``1.18.0``
+- ``pipdeptree`` from ``0.13.2`` to ``1.0.0``
+- ``requests`` from ``2.23.0`` to ``2.25.0``
+- ``idna`` from ``2.9`` to ``2.10``
+- ``urllib3`` from ``1.25.9`` to ``1.26.1``
+- ``certifi`` from ``2020.4.5.1`` to ``2020.11.8``
+- ``requirementslib`` from ``1.5.15`` to ``1.5.16``
+- ``attrs`` from ``19.3.0`` to ``20.3.0``
+- ``distlib`` from ``0.3.0`` to ``0.3.1``
+- ``packaging`` from ``20.3`` to ``20.4``
+- ``six`` from ``1.14.0`` to ``1.15.0``
+- ``semver`` from ``2.9.0`` to ``2.13.0``
+- ``toml`` from ``0.10.1`` to ``0.10.2``
+- ``cached-property`` from ``1.5.1`` to ``1.5.2``
+- ``yaspin`` from ``0.14.3`` to ``1.2.0``
+- ``resolvelib`` from ``0.3.0`` to ``0.5.2``
+- ``pep517`` from ``0.8.2`` to ``0.9.1``
+- ``zipp`` from ``0.6.0`` to ``1.2.0``
+- ``importlib-metadata`` from ``1.6.0`` to ``2.0.0``
+- ``importlib-resources`` from ``1.5.0`` to ``3.3.0``

pipenv/vendor/attr/__init__.py

@@ -1,10 +1,12 @@
 from __future__ import absolute_import, division, print_function
 
+import sys
+
 from functools import partial
 
-from . import converters, exceptions, filters, validators
+from . import converters, exceptions, filters, setters, validators
 from ._config import get_run_validators, set_run_validators
-from ._funcs import asdict, assoc, astuple, evolve, has
+from ._funcs import asdict, assoc, astuple, evolve, has, resolve_types
 from ._make import (
     NOTHING,
     Attribute,
@@ -19,7 +21,7 @@
 from ._version_info import VersionInfo
 
 
-__version__ = "19.3.0"
+__version__ = "20.3.0"
 __version_info__ = VersionInfo._from_version_string(__version__)
 
 __title__ = "attrs"
@@ -39,7 +41,6 @@
 ib = attr = attrib
 dataclass = partial(attrs, auto_attribs=True)  # happy Easter ;)
 
-
 __all__ = [
     "Attribute",
     "Factory",
@@ -61,8 +62,15 @@
     "has",
     "ib",
     "make_class",
+    "resolve_types",
     "s",
     "set_run_validators",
+    "setters",
     "validate",
     "validators",
 ]
+
+if sys.version_info[:2] >= (3, 6):
+    from ._next_gen import define, field, frozen, mutable
+
+    __all__.extend((define, field, frozen, mutable))