7 files changed, 13 insertions(+), 35 deletions(-)

M gnu/packages/astronomy.scm
M gnu/packages/check.scm
M gnu/packages/databases.scm
M gnu/packages/engineering.scm
M gnu/packages/python-check.scm
M gnu/packages/python-crypto.scm
M gnu/packages/python-xyz.scm

@@ 1196,7 1196,7 @@ accurately in real time at any rate desired.")
            python-ipython
            python-jplephem
            python-objgraph
-           python-pytest-7.1
+           python-pytest
            python-pytest-astropy
            python-pytest-xdist
            python-setuptools-scm


@@ 2717,7 2717,7 @@ implementation of the ASDF Standard.")
     (native-inputs (list python-astropy
                          python-jsonschema-next
                          python-pypa-build
-                         python-pytest-7.1
+                         python-pytest
                          python-packaging
                          python-setuptools-scm))
     (propagated-inputs (list python-importlib-resources))

@@ 1305,30 1305,8 @@ and many external plugins.")
 (define-deprecated python-pytest-6 python-pytest)
 (export python-pytest-6)
 
-;; Astropy started using hard dependencies for Pytest 7+, which might
-;; happen for some other projects. It could be set as default in staging.
-(define-public python-pytest-7.1
-  (package
-    (inherit python-pytest)
-    (version "7.1.3")
-    (name "python-pytest")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "pytest" version))
-       (sha256
-        (base32
-         "0f8c31v5r2kgjixvy267n0nhc4xsy65g3n9lz1i1377z5pn5ydjg"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments python-pytest)
-       ((#:phases phases #~%standard-phases)
-        #~(modify-phases #$phases
-            (add-before 'build 'pretend-version
-              (lambda _
-                (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))))
-    (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-pytest)
-       (replace "python-toml" python-tomli)))))
+(define-deprecated python-pytest-7 python-pytest)
+(export python-pytest-7)
 
 (define-public python-pytest-bootstrap
   (package

@@ 5173,7 5173,7 @@ mechanism of @code{dogpile}.")
      (list python-beautifulsoup4
            python-black
            python-cogapp
-           python-pytest-7.1
+           python-pytest
            python-pytest-asyncio
            python-pytest-runner
            python-pytest-timeout

@@ 2463,7 2463,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.")
                             (substitute* "pyvisa/shell.py"
                               (("from .thirdparty import prettytable")
                                "import prettytable")))))))
-    (native-inputs (list python-pytest-7.1))
+    (native-inputs (list python-pytest))
     (propagated-inputs (list python-dataclasses python-prettytable
                              python-typing-extensions))
     (home-page "https://pyvisa.readthedocs.io/en/latest/")


@@ 2500,7 2500,7 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.")
                          python-flake8
                          python-nbval
                          python-networkx
-                         python-pytest-7.1
+                         python-pytest
                          python-pytest-cov
                          python-pyvisa))
     (home-page "https://scikit-rf.org/")

@@ 961,7 961,7 @@ in Pytest.")
              (when tests?
                (add-installed-pythonpath inputs outputs)
                (invoke "python" "-m" "pytest")))))))
-    (native-inputs (list python-pytest-7.1 python-setuptools-scm))
+    (native-inputs (list python-pytest python-setuptools-scm))
     (home-page "https://github.com/pytest-dev/pytest-subtests")
     (synopsis "Unittest subTest() support and subtests fixture")
     (description "This Pytest plugin provides unittest @code{subTest()}

@@ 521,7 521,7 @@ is used by the Requests library to verify HTTPS requests.")
            python-hypothesis
            python-iso8601
            python-pretend
-           python-pytest-7.1            ;for subtests
+           python-pytest                ;for subtests
            python-pytest-benchmark
            python-pytest-subtests))
     (inputs (list python-cryptography-rust))

@@ 968,7 968,7 @@ Markdown.  All extensions are found under the module namespace of pymdownx.")
                 "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q"))))
     (build-system python-build-system)
     (native-inputs
-     (list python-pytest-7.1            ;for pytest-subtests
+     (list python-pytest                ;for pytest-subtests
            python-pytest-cov
            python-pytest-mpl
            python-pytest-subtests


@@ 15329,7 15329,7 @@ with a new public API, and RPython support.")
                          " and not test_macro_require"
                          " and not test_requires_pollutes_core"))))))))
     (native-inputs
-     (list python-pytest-7.1 python-wheel))
+     (list python-pytest python-wheel))
     (propagated-inputs
      (list python-funcparserlib))
     (home-page "https://docs.hylang.org/en/stable/")


@@ 16407,7 16407,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
            python-iniconfig
            python-moto
            python-msgpack
-           python-pytest-7.1            ;for pytest-subtests
+           python-pytest                ;for pytest-subtests
            python-pytest-celery
            python-pytest-subtests
            python-pytest-timeout


@@ 16501,7 16501,7 @@ ISO 8859, etc.).")
                  (lambda _
                    (setenv "QT_QPA_PLATFORM" "offscreen"))))))
     (native-inputs
-     (list python-pytest-7.1 python-pytest-cov python-pytest-xdist))
+     (list python-pytest python-pytest-cov python-pytest-xdist))
     (inputs
      (list qtbase-5))
     (propagated-inputs