guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/07: gnu: python-pytest-warnings: Mark as superseded by python-pytest.


From: Marius Bakke
Subject: 05/07: gnu: python-pytest-warnings: Mark as superseded by python-pytest.
Date: Thu, 1 Feb 2018 05:09:42 -0500 (EST)

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

commit 29f25f2929f2327c4eb102ec76df94df89b5070a
Author: Marius Bakke <address@hidden>
Date:   Thu Feb 1 10:44:57 2018 +0100

    gnu: python-pytest-warnings: Mark as superseded by python-pytest.
    
    * gnu/packages/check.scm (python-pytest-warnings)[properties]: New field.
    (python2-pytest-warnings): Use PACKAGE-WITH-PYTHON2.
    [properties]: Superseded by PYTHON2-PYTEST.
---
 gnu/packages/check.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f8d71ff7..59e644b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -25,7 +25,7 @@
 ;;; Copyright © 2017 Kei Kebreau <address@hidden>
 ;;; Copyright © 2017 ng0 <address@hidden>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <address@hidden>
-;;; Copyright © 2016, 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2017, 2018 Marius Bakke <address@hidden>
 ;;; Copyright © 2017 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Fis Trivial <address@hidden>
 ;;;
@@ -1391,10 +1391,15 @@ recognize TestCases.")
     (description
      "Python-pytest-warnings is a pytest plugin to list Python warnings in
 pytest report.")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-pytest-warnings))
+                  ;; This package is part of pytest as of version 3.1.0.
+                  (superseded . ,python-pytest)))))
 
 (define-public python2-pytest-warnings
-  (package-with-python2 python-pytest-warnings))
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-pytest-warnings)))
+           (properties `((superseded . ,python2-pytest)))))
 
 (define-public python-pytest-capturelog
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]