From f61b93762e5ef24011fa293e625686502640493c3d036f2543de11f48638c9c7 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Wed, 26 Apr 2023 02:21:36 +0000
Subject: [PATCH] - Add patch switch-to-build-module.patch:   - Drop
 {Build,}Requires on pep517.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-devpi-client?expand=0&rev=17
---
 python-devpi-client.changes  |  6 ++++
 python-devpi-client.spec     |  5 ++--
 switch-to-build-module.patch | 55 ++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 switch-to-build-module.patch

diff --git a/python-devpi-client.changes b/python-devpi-client.changes
index ce1badd..19a96b5 100644
--- a/python-devpi-client.changes
+++ b/python-devpi-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 26 02:20:24 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Add patch switch-to-build-module.patch:
+  - Drop {Build,}Requires on pep517. 
+
 -------------------------------------------------------------------
 Wed Apr 19 09:33:04 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-devpi-client.spec b/python-devpi-client.spec
index 63d09f7..2a18e2c 100644
--- a/python-devpi-client.spec
+++ b/python-devpi-client.spec
@@ -21,9 +21,10 @@ Version:        6.0.4
 Release:        0
 Summary:        Client for devpi
 License:        MIT
-Group:          Development/Languages/Python
 URL:            https://github.com/devpi/devpi
 Source:         https://files.pythonhosted.org/packages/source/d/devpi-client/devpi-client-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM gh#devpi/devpi#966
+Patch0:         switch-to-build-module.patch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
@@ -32,7 +33,6 @@ BuildRequires:  python-rpm-macros
 Requires:       python-build
 Requires:       python-check-manifest >= 0.28
 Requires:       python-devpi-common >= 3.6.0
-Requires:       python-pep517
 Requires:       python-pkginfo >= 1.4.2
 Requires:       python-pluggy >= 0.6.0
 Requires:       python-py >= 1.4.31
@@ -49,7 +49,6 @@ BuildRequires:  %{python_module build}
 BuildRequires:  %{python_module check-manifest >= 0.28}
 BuildRequires:  %{python_module devpi-common >= 3.6.0}
 BuildRequires:  %{python_module devpi-server}
-BuildRequires:  %{python_module pep517}
 BuildRequires:  %{python_module pkginfo >= 1.4.2}
 BuildRequires:  %{python_module pluggy >= 0.6.0}
 BuildRequires:  %{python_module py >= 1.4.31}
diff --git a/switch-to-build-module.patch b/switch-to-build-module.patch
new file mode 100644
index 0000000..61f1726
--- /dev/null
+++ b/switch-to-build-module.patch
@@ -0,0 +1,55 @@
+From 95af2bd5eb0636a64820d6a63462a8d4cfb033ba Mon Sep 17 00:00:00 2001
+From: Steve Kowalik <steven@wedontsleep.org>
+Date: Thu, 20 Apr 2023 16:20:37 +1000
+Subject: [PATCH] client: Use build instead of pep517
+
+pep517 has been renamed to pyproject-hooks, and as a consequence all of
+the deprecated functionality has been removed. Users of that
+functionality should switch to using build. Switch to using a method
+under build.util to determine the wheel metadata for upload.
+---
+ client/devpi/upload.py | 10 ++++++----
+ client/setup.py        |  1 -
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/client/devpi/upload.py b/client/devpi/upload.py
+index ded4245e..4a946128 100644
+--- a/devpi/upload.py
++++ b/devpi/upload.py
+@@ -5,8 +5,8 @@
+ import re
+ import zipfile
+ 
++import build.util
+ import check_manifest
+-import pep517.meta
+ 
+ from devpi_common.metadata import Version, get_pyversion_filetype
+ from devpi_common.archive import Archive
+@@ -378,9 +378,11 @@ def __str__(self):
+         return "<Exported %s>" % self.rootpath
+ 
+     def setup_name_and_version(self):
+-        result = pep517.meta.load(self.rootpath.strpath)
+-        name = result.metadata["name"]
+-        version = result.metadata["version"]
++        metadata = build.util.project_wheel_metadata(
++            self.rootpath.strpath, False
++        )
++        name = metadata["name"]
++        version = metadata["version"]
+         self.hub.debug("name, version = %s, %s" % (name, version))
+         return name, version
+ 
+diff --git a/client/setup.py b/client/setup.py
+index 7d9a98cc..92e7ff95 100755
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,6 @@ def get_changelog():
+         "check-manifest>=0.28",
+         "devpi_common<4,>=3.6.0",
+         "iniconfig",
+-        "pep517",
+         "pkginfo>=1.4.2",
+         "platformdirs",
+         "pluggy>=0.6.0,<2.0",