From a2fbf6879c7aefb391952a3478a05a1cfb9801ed Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 10 Nov 2024 15:40:04 +0000
Subject: [PATCH] gnu: Remove python-pytest-next.

* gnu/packages/check.scm (python-pytest-next): Delete variable.

* gnu/packages/python-science.scm (python-pandas-2) [native-inputs]:
Remove python-pytest-next; add python-pytest.

* gnu/packages/python-xyz.scm (python-hy) [native-inputs]: Remove
python-pytest-next; add python-pytest.

Change-Id: I57e14aa11c2e3cd1d8e8119f566b49fd902c7957
---
 gnu/packages/check.scm          | 14 --------------
 gnu/packages/python-science.scm |  2 +-
 gnu/packages/python-xyz.scm     |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index f1adfbb5584ac286cbb25d469e29487a651fe2a1..3fc3f1de5bb0ecf08ec22fa66206b4213ff15052 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -1589,20 +1589,6 @@ and functions, detailed info on failing assert statements, modular fixtures,
 and many external plugins.")
     (license license:expat)))
 
-(define-public python-pytest-next
-  (package/inherit python-pytest
-    (name "python-pytest")
-    (version "7.3.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest" version))
-       (sha256
-        (base32 "02q32y67nflrmk9snmibq5kmqcbgfm29k9wm0yw0ia2vqly0m6gf"))))
-    (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-pytest)
-       (append python-exceptiongroup)))))
-
 (define-deprecated python-pytest-6 python-pytest)
 (export python-pytest-6)
 
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 495836c4a824e7a272ba5a661932c2b14057a4f0..fe439ff1c07920654681bf29f323222db6f80d58 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -1206,7 +1206,7 @@ doing practical, real world data analysis in Python.")
            python-matplotlib
            python-openpyxl
            python-pytest-asyncio
-           python-pytest-next
+           python-pytest
            python-pytest-localserver
            python-pytest-mock
            python-pytest-xdist
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6b3ea6a78d17c3a03a83c2fe6a8b95e7c343bd45..299c660e025efd10a2e1531895c0fda04634822b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -19206,7 +19206,7 @@ with a new public API, and RPython support.")
       ;; This test expects the hy executable to be called 'hy', but in Guix
       ;; it's .hy-real.
       #:test-flags #~(list "-k" "not test_sys_executable")))
-    (native-inputs (list python-pytest-next python-wheel))
+    (native-inputs (list python-pytest python-wheel))
     (propagated-inputs (list python-funcparserlib))
     (home-page "https://docs.hylang.org/en/stable/")
     (synopsis "Lisp frontend to Python")