01/02: gnu: python2-astroid: Add missing input and don't inherit.

[guix-commits]

rekado pushed a commit to branch core-updates-frozen
in repository guix.

commit 239c90f4bfe8ea50e94c6593b0b5d99ced7c583b
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Wed Nov 24 14:07:39 2021 +0100

    gnu: python2-astroid: Add missing input and don't inherit.
    
    * gnu/packages/python-xyz.scm (python2-astroid)[arguments]: Do not inherit
    from Python 3 package variant.
    [propagated-inputs]: Do not inherit and add python2-six.
---
 gnu/packages/python-xyz.scm | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 822555a..5364665 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -18185,26 +18185,27 @@ builds partial trees by inspecting living objects.")
         (base32
          "0fir4b67sm7shcacah9n61pvq313m523jb4q80sycrh3p8nmi6zw"))))
     (arguments
-      (substitute-keyword-arguments (package-arguments base)
-        ((#:phases phases)
-         `(modify-phases ,phases
-            (add-after 'unpack 'remove-spurious-test
-              (lambda _
-                ;; https://github.com/PyCQA/astroid/issues/276
-                (delete-file "astroid/tests/unittest_brain.py")
-                #t))
-            (replace 'check
-              (lambda _
-                (invoke"python" "-m" "unittest" "discover"
-                                "-p" "unittest*.py")))))))
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'remove-spurious-test
+           (lambda _
+             ;; https://github.com/PyCQA/astroid/issues/276
+             (delete-file "astroid/tests/unittest_brain.py")))
+         (replace 'check
+           (lambda* (#:key tests? #:allow-other-keys)
+             (when tests?
+               (invoke "python" "-m" "unittest" "discover"
+                       "-p" "unittest*.py")))))))
     (native-inputs `())
     (propagated-inputs
-      `(("python2-backports-functools-lru-cache"
-         ,python2-backports-functools-lru-cache)
-        ("python2-enum34" ,python2-enum34)
-        ("python2-singledispatch" ,python2-singledispatch)
-        ,@(alist-delete "python-typed-ast"
-                        (package-propagated-inputs base)))))))
+     `(("python2-backports-functools-lru-cache"
+        ,python2-backports-functools-lru-cache)
+       ("python2-enum34" ,python2-enum34)
+       ("python2-lazy-object-proxy" ,python2-lazy-object-proxy)
+       ("python2-singledispatch" ,python2-singledispatch)
+       ("python2-six" ,python2-six)
+       ("python2-wrapt" ,python2-wrapt))))))
 
 (define-public python-isbnlib
   (package