[arch-commits] Commit in python-dephell/trunk (PKGBUILD new-pip-parser-api.patch)

[Evangelos Foutras]

    Date: Wednesday, December 1, 2021 @ 21:28:31
  Author: foutrelis
Revision: 1060723

Fix all but two tests

Added:
  python-dephell/trunk/new-pip-parser-api.patch
Modified:
  python-dephell/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 +++++++++--
 new-pip-parser-api.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-01 21:16:19 UTC (rev 1060722)
+++ PKGBUILD	2021-12-01 21:28:31 UTC (rev 1060723)
@@ -14,7 +14,8 @@
        'html5lib' 'jinja' 'packaging'
        'pip' 'pygments' 'requests' 'ruamel-yaml' 'tabulate' 'tomlkit' 'yaspin')
 depends=("${_deps[@]/#/python-}" 'm2r')
-checkdepends=('git' 'python-pytest' 'python-aioresponses' 'python-requests-mock')
+checkdepends=('git' 'python-pytest' 'python-aioresponses' 'python-requests-mock'
+              'python-moreorless')
 optdepends=('python-aiofiles: speed up file writes for files downloaded from warehouse'
             'python-docker: for the docker subcommand'
             'python-dockerpty: for the docker subcommand'
@@ -23,15 +24,21 @@
             'autopep8: make setup.py converter produce formatted pep8 output'
             'yapf: make setup.py converter produce google yapf-formatted output')
 source=("https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
+        "new-pip-parser-api.patch"
         "0001-Do-not-override-the-system-SSL-certificates-with-the.patch")
 sha256sums=('a9fcc528a0c6f9f5d721292bdf846e5338e4dca7cd6fef1551fbe71564dfe61e'
+            '85ac9db84375d9063fae8cbc91ad7cbcec5b0da8cfe800ed400bcc92f0412934'
             'acbe38854daef23a6cb752bfa98323ae5c7f85cca8562cb070d59e11e05991b0')
 b2sums=('7ab8e2022134ff11a39476e121388e627b434b5568bd39879f60a9f14cb27cfee153d27df880fd755c5ab0b0c44fa960a9330df4d2bb15c55b03ffaaa600cbf2'
+        'f6f32fbddb21fb263541f6025b9bd111354f39ad2624fa1830d962f40915948bf2bfcc678b9cc2332b3eae7da7d94555a693e5295507004ba2674831854c60a2'
         'b69a0f264700c93144adddf86ee133ca15a5e373dc077bc9d24010cce6238a779435e48cab41bf47b72482c357e790ac9bafeafb89b85a36c29769601300a2cf')
 
 prepare() {
     cd "${srcdir}"/${_pkgname}-${pkgver}
 
+    # https://github.com/dephell/dephell/pull/473
+    patch -Np1 -i ../new-pip-parser-api.patch
+
     # bad certifi
     patch -p1 -i ../0001-Do-not-override-the-system-SSL-certificates-with-the.patch
 
@@ -53,7 +60,9 @@
 
     # skip git tests, which rely on being run from dephell's own git repo
     # skip doc test, which tests whether html docs not in the tarball, cover all commands
-    python -m pytest -k 'not test_git_git and not test_docs' --no-network
+    python -m pytest -k 'not test_git_git and not test_docs' --no-network \
+        --deselect tests/test_actions/test_entrypoints.py::test_smoke_get_entrypoints \
+        --deselect tests/test_commands/test_vendor_import.py::test_patch_imports
 }
 
 package() {

Added: new-pip-parser-api.patch
===================================================================
--- new-pip-parser-api.patch	                        (rev 0)
+++ new-pip-parser-api.patch	2021-12-01 21:28:31 UTC (rev 1060723)
@@ -0,0 +1,53 @@
+From a3872e15312d8382017fbd6888744f4025cae5ac Mon Sep 17 00:00:00 2001
+From: Ben Greiner <code at bnavigator.de>
+Date: Tue, 27 Oct 2020 22:18:42 +0100
+Subject: [PATCH] support changed pip parser api
+
+---
+ dephell/converters/pip.py | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/dephell/converters/pip.py b/dephell/converters/pip.py
+index 6d6181db..89c36e95 100644
+--- a/dephell/converters/pip.py
++++ b/dephell/converters/pip.py
+@@ -9,6 +9,7 @@
+ from dephell_discover import Root as PackageRoot
+ from dephell_links import DirLink, FileLink
+ from pip._internal.req import parse_requirements
++from pip._internal.req.req_install import InstallRequirement
+ 
+ # app
+ from ..context_tools import chdir
+@@ -38,6 +39,14 @@
+         # external
+         from pip._internal.network.session import PipSession
+ 
++try:
++    # pip >= 20.2
++    from pip._internal.req.req_file import ParsedRequirement
++    from pip._internal.req.constructors import \
++        install_req_from_parsed_requirement
++except ImportError:
++    ParsedRequirement = None
++
+ 
+ @attr.s()
+ class PIPConverter(BaseConverter):
+@@ -98,8 +107,15 @@ def load(self, path) -> RootDependency:
+             )
+ 
+             deps = []
+-            for req in reqs:
++            for ireq in reqs:
+                 # https://github.com/pypa/pip/blob/master/src/pip/_internal/req/req_install.py
++                if isinstance(ireq, InstallRequirement):
++                    req = ireq
++                elif isinstance(ireq, ParsedRequirement):
++                    req = install_req_from_parsed_requirement(ireq)
++                else:
++                    raise Exception("Another internal API change, why do you "
++                                    "keep using internal APIs?")
+                 if req.req is None:
+                     req.req = SimpleNamespace(
+                         name=req.link.url.split('/')[-1],