13/15: gnu: python-urllib3: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-ungrafting
in repository guix.

commit 7d4fee26fb5a328ade3212dc728ca38c21c48e62
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:54:20 2021 -0400

    gnu: python-urllib3: Absorb grafted replacement.
    
    * gnu/packages/python-web.scm (python-urllib3): Update to 1.26.4.
    [replacement]: Remove field.
    (python-urllib3/fixed): Remove variable.
---
 gnu/packages/python-web.scm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b7411d2..48dfc3b 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2756,15 +2756,14 @@ authenticated session objects providing things like 
keep-alive.")
 (define-public python-urllib3
   (package
     (name "python-urllib3")
-    (version "1.26.2")
+    (version "1.26.4")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "urllib3" version))
         (sha256
          (base32
-          "024yldjwjavps39yb77sc422z8fa9bn20wcqrcncjwrqjab8y60r"))))
-    (replacement python-urllib3/fixed)
+          "0dw9w9bs3hmr5dp3r3h43jyzzb1g1046ag7lj8pqf58i4kvj3c77"))))
     (build-system python-build-system)
     (arguments `(#:tests? #f))
     (propagated-inputs
@@ -2783,17 +2782,6 @@ supports url redirection and retries, and also gzip and 
deflate decoding.")
     (properties `((python2-variant . ,(delay python2-urllib3))))
     (license license:expat)))
 
-(define python-urllib3/fixed
-  (package/inherit python-urllib3
-    (version "1.26.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "urllib3" version))
-       (sha256
-        (base32
-         "0dw9w9bs3hmr5dp3r3h43jyzzb1g1046ag7lj8pqf58i4kvj3c77"))))))
-
 ;; Some software requires an older version of urllib3, notably Docker.
 (define-public python-urllib3-1.24
   (package (inherit python-urllib3)