From 6b3cef844c5b7c5628fba57e6aed42c56d06cbca Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 15 Jan 2020 20:10:26 +0100
Subject: gnu: python-zipp: Update to 1.0.0.

* gnu/packages/python-compression.scm (python-zipp): Update to 1.0.0.
[propagated-inputs]: Remove PYTHON-RST.LINKER.  Add PYTHON-MORE-ITERTOOLS.
Move PYTHON-CONTEXTLIB2 and PYTHON-PATHLIB2 ...
[native-inputs]: ... here.  Remove PYTHON-SPHINX.
---
 gnu/packages/python-compression.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/python-compression.scm')

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 0f2bc78c12..6015b5aae3 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -211,22 +211,21 @@ (define-public bitshuffle-for-snappy
 (define-public python-zipp
   (package
     (name "python-zipp")
-    (version "0.5.1")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "zipp" version))
        (sha256
         (base32
-         "1hsv4zwy1pwnbrr63wjjkpwrmnk36ngbkkqw01bj5hcwh1z3m56a"))))
+         "0v3qayhqv7vyzydpydwcp51bqciw8p2ajddw68x5k8zppc0vx3yk"))))
     (build-system python-build-system)
     (propagated-inputs
+     `(("python-more-itertools" ,python-more-itertools)))
+    (native-inputs
      `(("python-contextlib2" ,python-contextlib2)
        ("python-pathlib2" ,python-pathlib2)
-       ("python-rst.linker" ,python-rst.linker)))
-    (native-inputs
-     `(("python-setuptools-scm" ,python-setuptools-scm)
-       ("python-sphinx" ,python-sphinx)
+       ("python-setuptools-scm" ,python-setuptools-scm)
        ("python-unittest2" ,python-unittest2)))
     (home-page "https://github.com/jaraco/zipp")
     (synopsis
-- 
cgit v1.2.3


From f15bdfebc6bb516d235bdf51ecdd2b35f9709f00 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 15 Jan 2020 20:12:09 +0100
Subject: gnu: Add python2-zipp.

* gnu/packages/python-compression.scm (python2-zipp): New public variable.
---
 gnu/packages/python-compression.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnu/packages/python-compression.scm')

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 6015b5aae3..7de5be72a1 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -235,6 +235,9 @@ (define-public python-zipp
 wrapper.  It provides a backport of the @code{Path} object.")
     (license license:expat)))
 
+(define-public python2-zipp
+  (package-with-python2 python-zipp))
+
 (define-public python-zstandard
   (package
     (name "python-zstandard")
-- 
cgit v1.2.3


From bd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 15 Jan 2020 21:42:15 +0100
Subject: gnu: python-zipp: Remove redundant inputs.

The Python 3 variant do not need these.

* gnu/packages/python-compression.scm (python-zipp)[native-inputs]: Remove
PYTHON-CONTEXTLIB2, PYTHON-PATHLIB2, and PYTHON-UNITTEST2.
[properties]: New field.
(python2-zipp)[native-inputs]: Add PYTHON2-CONTEXTLIB2, PYTHON2-PATHLIB2, and
PYTHON2-UNITTEST2.
---
 gnu/packages/python-compression.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/python-compression.scm')

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 7de5be72a1..70abc7bad1 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -223,20 +223,25 @@ (define-public python-zipp
     (propagated-inputs
      `(("python-more-itertools" ,python-more-itertools)))
     (native-inputs
-     `(("python-contextlib2" ,python-contextlib2)
-       ("python-pathlib2" ,python-pathlib2)
-       ("python-setuptools-scm" ,python-setuptools-scm)
-       ("python-unittest2" ,python-unittest2)))
+     `(("python-setuptools-scm" ,python-setuptools-scm)))
     (home-page "https://github.com/jaraco/zipp")
     (synopsis
      "Backport of pathlib-compatible object wrapper for zip files")
     (description
      "This package provides a @code{pathlib}-compatible @code{Zipfile} object
 wrapper.  It provides a backport of the @code{Path} object.")
+    (properties `((python2-variant . ,(delay python2-zipp))))
     (license license:expat)))
 
 (define-public python2-zipp
-  (package-with-python2 python-zipp))
+  (let ((base (package-with-python2 (strip-python2-variant python-zipp))))
+    (package/inherit
+     base
+     (native-inputs
+      `(("python-contextlib2" ,python2-contextlib2)
+        ("python-pathlib2" ,python2-pathlib2)
+        ("python-unittest2" ,python2-unittest2)
+        ,@(package-native-inputs base))))))
 
 (define-public python-zstandard
   (package
-- 
cgit v1.2.3