gnu: python-xmp-toolkit: Update to 2.1.0.

* gnu/packages/python-xyz.scm (python-xmp-toolkit): Update to 2.1.0.
[source]: Remove patch as applied upstream.
[arguments] <test-flags>: Run all tests.
<phases>: Remove 'configure-environment; add 'patch-source.
[native-inputs]: Remove python-setuptools and python-wheel; add
python-flit-core.

* gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch:
Delete file.
* gnu/local.mk (dist_patch_DATA): Deregister patch.

Change-Id: I3443ecd6ad2bd423544d06d1e6e0de7079ed6296
Signed-off-by: Rutherther <rutherther@ditigal.xyz>

gnu/local.mk

@@ -2226,7 +2226,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch	\
   %D%/packages/patches/python-versioneer-guix-support.patch	\
   %D%/packages/patches/python-werkzeug-tests.patch		\
-  %D%/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch	\
   %D%/packages/patches/qdigidoc-bundle-config-files.patch       \
   %D%/packages/patches/qdigidoc-bundle-tsl-files.patch          \
   %D%/packages/patches/qemu-build-info-manual.patch		\

gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch

@@ -1,51 +0,0 @@
-From fd9e887a1853d9b4bc3fce20d414d648fb5abbfc Mon Sep 17 00:00:00 2001
-From: Asher Glick <asher.glick@gmail.com>
-Date: Mon, 1 Mar 2021 14:35:46 -0600
-Subject: [PATCH] Add missing error codes and graceful handling of possible
- future missing codes.
-
----
- libxmp/exempi.py | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/libxmp/exempi.py b/libxmp/exempi.py
-index 683e240..f58003c 100644
---- a/libxmp/exempi.py
-+++ b/libxmp/exempi.py
-@@ -85,6 +85,7 @@ ERROR_MESSAGE = {    0: "unknown error",
-                    -13: "std exception",
-                    -14: "unknown exception",
-                    -15: "no memory",
-+                   -16: "progress abort",
-                   -101: "bad schema",
-                   -102: "bad XPath",
-                   -103: "bad options",
-@@ -95,6 +96,14 @@ ERROR_MESSAGE = {    0: "unknown error",
-                   -108: "bad file format",
-                   -109: "no file handler",
-                   -110: "too large for JPEG",
-+                  -111: "no file",
-+                  -112: "file permission error",
-+                  -113: "disk space",
-+                  -114: "read error",
-+                  -115: "write error",
-+                  -116: "bad block format",
-+                  -117: "file path not a file",
-+                  -118: "rejected file extension",
-                   -201: "bad XML",
-                   -202: "bad RDF",
-                   -203: "bad XMP",
-@@ -1697,6 +1706,9 @@ def check_error(success):
-     # so we supplement it by explicitly checking the error code.
-     ecode = EXEMPI.xmp_get_error()
-     if not success or ecode != 0:
--        error_msg = ERROR_MESSAGE[ecode]
-+        if ecode in ERROR_MESSAGE:
-+            error_msg = ERROR_MESSAGE[ecode]
-+        else:
-+            error_msg = "Unexpected error code " + str(ecode)
-         msg = 'Exempi function failure ("{0}").'.format(error_msg)
-         raise XMPError(msg)
--- 
-2.30.2
-

gnu/packages/python-xyz.scm

@@ -41326,34 +41326,31 @@ Library.")
 (define-public python-xmp-toolkit
   (package
     (name "python-xmp-toolkit")
-    (version "2.0.2")
+    (version "2.1.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "python-xmp-toolkit" version))
+       (uri (pypi-uri "python_xmp_toolkit" version))
        (sha256
-        (base32 "12x6lyaxjpbl8ll3cj97039kwvsha2nkx2v8v8irfbi2p0dl721s"))
-        (patches (search-patches
-                   "python-xmp-toolkit-add-missing-error-codes.patch"))))
+        (base32 "1np2njq6c1fnxh6bbh3xp2slz5dm7aamknv7hxax53a11p3a42na"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:test-flags
-      #~(list "-k" (string-append "not test_can_put_xmp and "
-                                  "not test_exempi_bad_combinations and "
-                                  "not test_formats and "
-                                  "not test_get_xmp and "
-                                  "not test_open_file_with_options"))
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'build 'configure-environment
-            (lambda* (#:key outputs inputs #:allow-other-keys)
-              (let ((exempi #$(this-package-input "exempi")))
-                (setenv "LD_LIBRARY_PATH"
-                        (string-append exempi "/lib"))))))))
-    (inputs (list exempi))
-    (propagated-inputs (list python-pytz))
-    (native-inputs (list python-pytest python-setuptools python-wheel))
+          (add-after 'unpack 'patch-source
+            (lambda* (#:key inputs #:allow-other-keys)
+              (substitute* "libxmp/exempi.py"
+                (("ctypes.util.find_library\\('exempi'\\)")
+                 (format #f "~s" (search-input-file
+                                  inputs "lib/libexempi.so")))))))))
+    (native-inputs
+     (list python-pytest
+           python-flit-core))
+    (inputs
+     (list exempi))
+    (propagated-inputs
+     (list python-pytz))
     (home-page "https://github.com/python-xmp-toolkit/python-xmp-toolkit")
     (synopsis "Python XMP Toolkit for working with metadata")
     (description "Python XMP Toolkit is a library for working with XMP