From e8db2d4eb00f96950e30da0614d5f7fb8a94a459236878ab9a98b129cc8fec42 Mon Sep 17 00:00:00 2001
From: Steve Kowalik <steven.kowalik@suse.com>
Date: Tue, 17 Oct 2023 03:21:25 +0000
Subject: [PATCH] - Update to 4.0.2:   * Bug Fixes     + Do not mark commands
 with returncode ``None`` from tox 4.x as failed.     + Restore flushing after
 each written line in new TerminalWriter.     + Fix #939: custom legacy
 version parsing (non PEP 440) after       packaging >= 22.0 removed support. 
  * Deprecations and Removals     + Removed ``HTMLPage`` class originally
 vendored from pip.     + Dropped support for Python <= 3.6.   * Features    
 + Add ``chdir`` context handler in devpi_common.contextlib.     + Hide
 username from URL representation.     + Added stripped down TerminalWriter
 from ``py`` library which only       supports coloring. - Switch to pyproject
 macros.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-devpi-common?expand=0&rev=12
---
 devpi-common-3.7.2.tar.gz   |  3 ---
 devpi-common-4.0.2.tar.gz   |  3 +++
 python-devpi-common.changes | 19 +++++++++++++++++++
 python-devpi-common.spec    | 18 ++++++++----------
 unpin-versions.patch        | 13 -------------
 5 files changed, 30 insertions(+), 26 deletions(-)
 delete mode 100644 devpi-common-3.7.2.tar.gz
 create mode 100644 devpi-common-4.0.2.tar.gz
 delete mode 100644 unpin-versions.patch

diff --git a/devpi-common-3.7.2.tar.gz b/devpi-common-3.7.2.tar.gz
deleted file mode 100644
index f50985f..0000000
--- a/devpi-common-3.7.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9078989279ad79e9c181c7badc4a738460445187101eb0cbade675934d5e4644
-size 25138
diff --git a/devpi-common-4.0.2.tar.gz b/devpi-common-4.0.2.tar.gz
new file mode 100644
index 0000000..f927df3
--- /dev/null
+++ b/devpi-common-4.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d277701faf05d4a6f6cbdb7e040f93c0a00286dbe87d5c0a2eeaeba2055919c
+size 389075
diff --git a/python-devpi-common.changes b/python-devpi-common.changes
index 1a3b512..6452d53 100644
--- a/python-devpi-common.changes
+++ b/python-devpi-common.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Oct 17 03:16:31 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 4.0.2: 
+  * Bug Fixes
+    + Do not mark commands with returncode ``None`` from tox 4.x as failed.
+    + Restore flushing after each written line in new TerminalWriter.
+    + Fix #939: custom legacy version parsing (non PEP 440) after
+      packaging >= 22.0 removed support.
+  * Deprecations and Removals
+    + Removed ``HTMLPage`` class originally vendored from pip.
+    + Dropped support for Python <= 3.6.
+  * Features
+    + Add ``chdir`` context handler in devpi_common.contextlib.
+    + Hide username from URL representation.
+    + Added stripped down TerminalWriter from ``py`` library which only
+      supports coloring.
+- Switch to pyproject macros.
+
 -------------------------------------------------------------------
 Fri Jun  9 07:36:13 UTC 2023 - ecsos <ecsos@opensuse.org>
 
diff --git a/python-devpi-common.spec b/python-devpi-common.spec
index 0928c76..1118e70 100644
--- a/python-devpi-common.spec
+++ b/python-devpi-common.spec
@@ -18,19 +18,19 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-devpi-common
-Version:        3.7.2
+Version:        4.0.2
 Release:        0
 Summary:        Utilities jointly used by devpi-server and devpi-client
 License:        MIT
-Group:          Development/Languages/Python
 URL:            https://github.com/devpi/devpi
 Source:         https://files.pythonhosted.org/packages/source/d/devpi-common/devpi-common-%{version}.tar.gz
-Patch1:         unpin-versions.patch
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires:       python-lazy
 Requires:       python-packaging
-Requires:       python-py >= 1.4.20
 Requires:       python-requests >= 2.3.0
 BuildArch:      noarch
 # SECTION test requirements
@@ -49,21 +49,19 @@ Utilities jointly used by devpi-server and devpi-client.
 rm tox.ini
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# Doesn't work with latest packaging module because invalid version
-donttest="test_noversion_sameproject or test_sort_sameproject_links"
-%pytest -k "not ($donttest)"
+%pytest
 
 %files %{python_files}
 %doc CHANGELOG README.rst
 %license LICENSE
 %{python_sitelib}/devpi_common
-%{python_sitelib}/devpi_common-%{version}*-info
+%{python_sitelib}/devpi_common-%{version}.dist-info
 
 %changelog
diff --git a/unpin-versions.patch b/unpin-versions.patch
deleted file mode 100644
index a521b9c..0000000
--- a/unpin-versions.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: devpi-common-3.7.2/setup.py
-===================================================================
---- devpi-common-3.7.2.orig/setup.py
-+++ devpi-common-3.7.2/setup.py
-@@ -34,7 +34,7 @@ if __name__ == "__main__":
-       packages=['devpi_common', 'devpi_common.vendor'],
-       install_requires=[
-           "lazy",
--          "packaging<22",
-+          "packaging",
-           "py>=1.4.20",
-           "requests>=2.3.0"],
-       python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",