From 347ce479730b94df65953daacf4cf0c55cb4f712 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Mon, 25 Apr 2022 05:04:47 -0400 Subject: [PATCH] vendor in requirementslib==1.6.4 (#5082) * vendor in requirementslib==1.6.4 * add news fragment. --- news/5081.vendor.rst | 1 + pipenv/vendor/requirementslib/__init__.py | 2 +- pipenv/vendor/requirementslib/models/setup_info.py | 6 +++++- pipenv/vendor/vendor.txt | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 news/5081.vendor.rst diff --git a/news/5081.vendor.rst b/news/5081.vendor.rst new file mode 100644 index 0000000000..bee4c83197 --- /dev/null +++ b/news/5081.vendor.rst @@ -0,0 +1 @@ +Vendor in ``requirementslib==1.6.4`` to Fix ``SetuptoolsDeprecationWarning`` ``setuptools.config.read_configuration`` became deprecated. diff --git a/pipenv/vendor/requirementslib/__init__.py b/pipenv/vendor/requirementslib/__init__.py index bed3fd38b1..09a3af35b2 100644 --- a/pipenv/vendor/requirementslib/__init__.py +++ b/pipenv/vendor/requirementslib/__init__.py @@ -10,7 +10,7 @@ from .models.pipfile import Pipfile from .models.requirements import Requirement -__version__ = "1.6.3" +__version__ = "1.6.4" logger = logging.getLogger(__name__) diff --git a/pipenv/vendor/requirementslib/models/setup_info.py b/pipenv/vendor/requirementslib/models/setup_info.py index ee7767ccae..b8ae0a326c 100644 --- a/pipenv/vendor/requirementslib/models/setup_info.py +++ b/pipenv/vendor/requirementslib/models/setup_info.py @@ -513,7 +513,11 @@ def _find_in_dict(dict_: ast.Dict, name: str) -> "Optional[Any]": def setuptools_parse_setup_cfg(path): - from setuptools.config import read_configuration + try: + # v61.0.0 of setuptools deprecated setuptools.config.read_configuration + from setuptools.config.setupcfg import read_configuration + except ImportError: + from setuptools.config import read_configuration parsed = read_configuration(path) results = parsed.get("metadata", {}) diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index 11132ab659..0e1695a84b 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -30,7 +30,7 @@ python-dateutil==2.8.2 python-dotenv==0.19.0 pythonfinder==1.2.10 requests==2.26.0 -requirementslib==1.6.3 +requirementslib==1.6.4 shellingham==1.4.0 six==1.16.0 termcolor==1.1.0