3 files changed, 4 insertions(+), 19 deletions(-)

M gnu/packages/check.scm
M gnu/packages/databases.scm
M gnu/packages/python-xyz.scm

@@ 1328,7 1328,6 @@ and many external plugins.")
                 (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs python-pytest)
-       (replace "python-pluggy" python-pluggy-next)
        (replace "python-toml" python-tomli)))))
 
 (define-public python-pytest-bootstrap

@@ 5166,7 5166,7 @@ mechanism of @code{dogpile}.")
            python-jinja2
            python-mergedeep
            python-pint
-           python-pluggy-next
+           python-pluggy
            python-pyyaml
            python-uvicorn))
     (native-inputs

@@ 15582,36 15582,22 @@ library as well as on the command line.")
 (define-public python-pluggy
   (package
    (name "python-pluggy")
-   (version "0.13.1")
+   (version "1.0.0")
    (source
     (origin
      (method url-fetch)
      (uri (pypi-uri "pluggy" version))
      (sha256
       (base32
-       "1c35qyhvy27q9ih9n899f3h4sdnpgq027dbiilly2qb5cvgarchm"))))
+       "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922"))))
    (build-system python-build-system)
-   (native-inputs
-    (list python-setuptools-scm))
+   (native-inputs (list python-setuptools-scm))
    (synopsis "Plugin and hook calling mechanism for Python")
    (description "Pluggy is an extraction of the plugin manager as used by
 Pytest but stripped of Pytest specific details.")
    (home-page "https://pypi.org/project/pluggy/")
    (license license:expat)))
 
-;;; TODO: Make this the default python-pluggy in the next rebuild cycle.
-(define-public python-pluggy-next
-  (package
-   (inherit python-pluggy)
-   (version "1.0.0")
-   (source
-    (origin
-     (method url-fetch)
-     (uri (pypi-uri "pluggy" version))
-     (sha256
-      (base32
-       "0n8iadlas2z1b4h0fc73b043c7iwfvx9rgvqm1azjmffmhxkf922"))))))
-
 (define-public python-plumbum
   (package
     (name "python-plumbum")