gnu: python-wheel: Define 'python2-variant'.

* gnu/packages/python.scm (python-wheel)[properties]: New field.
(python2-wheel): Use 'strip-python2-variant'.
(python2-requests): Take the result of 'package-with-python2' directly.
* gnu/packages/openstack.scm (python2-requests-mock): Likewise.
(python2-oslosphinx): Likewise.

1 files changed, 2 insertions, 9 deletions

diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 9a42a913400..08a76a3695a 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -304,12 +304,7 @@ portions of your testing code.")
     (license asl2.0)))
 
 (define-public python2-requests-mock
-  (let ((requests-mock (package-with-python2 python-requests-mock)))
-    (package (inherit requests-mock)
-      (propagated-inputs
-       `(("python2-requests" ,python2-requests)
-         ,@(alist-delete "python-requests"
-                         (package-propagated-inputs requests-mock)))))))
+  (package-with-python2 python-requests-mock))
 
 (define-public python-stevedore
   (package
@@ -601,9 +596,7 @@ from the OpenStack project.")
     (license asl2.0)))
 
 (define-public python2-oslosphinx
-  (let ((oslosphinx (package-with-python2 python-oslosphinx)))
-    (package (inherit oslosphinx)
-      (propagated-inputs `(("python2-requests" ,python2-requests))))))
+  (package-with-python2 python-oslosphinx))
 
 (define-public python-oslotest
   (package