From fb62edfc35fd6896bd30c06038718b630c1b92bd Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 3 Feb 2020 16:04:29 +0100
Subject: gnu: python-importlib-metadata: Update to 1.5.0.

* gnu/packages/python-xyz.scm (python-importlib-metadata): Update to 1.5.0.
[native-inputs]: Add PYTHON-PYFAKEFS.
(python2-importlib-metadata)[native-inputs]: Add PYTHON2-PYFAKEFS-BOOTSTRAP.
* gnu/packages/check.scm (python2-pyfakefs-bootstrap): New public variable.
---
 gnu/packages/check.scm      | 13 +++++++++++++
 gnu/packages/python-xyz.scm | 11 +++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 3c2bdaff3a..749bcc7831 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -2547,3 +2547,16 @@ system.  The code under test requires no modification to work with pyfakefs.")
 
 (define-public python2-pyfakefs
   (package-with-python2 python-pyfakefs))
+
+;; This minimal variant is used to avoid a circular dependency between
+;; python2-importlib-metadata, which requires pyfakefs for its tests, and
+;; python2-pytest, which requires python2-importlib-metadata.
+(define-public python2-pyfakefs-bootstrap
+  (hidden-package
+   (package
+     (inherit python2-pyfakefs)
+     (name "python2-pyfakefs-bootstrap")
+     (native-inputs '())
+     (arguments
+      `(#:python ,python-2
+        #:tests? #f)))))
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b884b4eee1..2024d07d46 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5019,18 +5019,20 @@ for older versions of Python.")
 (define-public python-importlib-metadata
   (package
     (name "python-importlib-metadata")
-    (version "1.4.0")
+    (version "1.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "importlib_metadata" version))
        (sha256
-        (base32 "1n76444v7zn910xrhh8954jdn4byxbn9f1jck6b85a716mbh2z7i"))))
+        (base32
+         "00ikdj4gjhankdljnz7g5ggak4k9lql2926x0x117ir9j2lv7x86"))))
     (build-system python-build-system)
     (propagated-inputs
      `(("python-zipp" ,python-zipp)))
     (native-inputs
      `(("python-setuptools-scm" ,python-setuptools-scm)
+       ("python-pyfakefs" ,python-pyfakefs)
        ("python-packaging" ,python-packaging)))
     (home-page "https://importlib-metadata.readthedocs.io/")
     (synopsis "Read metadata from Python packages")
@@ -5051,8 +5053,9 @@ need to use the older and less efficient @code{pkg_resources} package.")
      base
      (name "python2-importlib-metadata")
      (native-inputs
-      `(("python-packaging" ,python2-packaging-bootstrap)
-        ,@(alist-delete "python-packaging" (package-native-inputs base))))
+      `(("python-setuptools-scm" ,python2-setuptools-scm)
+        ("python-pyfakefs" ,python2-pyfakefs-bootstrap)
+        ("python-packaging" ,python2-packaging-bootstrap)))
      (propagated-inputs
       `(("python-configparser" ,python2-configparser)
         ("python-contextlib2" ,python2-contextlib2)
-- 
cgit v1.2.3