From fb02a58c5e2d5d4ed57b990d94b5e52d9b81d2ae94733d03b78be4ab6942ab4f Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 22 Mar 2023 09:32:18 +0000 Subject: [PATCH] - add unpin-versions.patch to reduce the packaging version conflict OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-devpi-common?expand=0&rev=8 --- python-devpi-common.changes | 5 +++++ python-devpi-common.spec | 4 +++- unpin-versions.patch | 13 +++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 unpin-versions.patch diff --git a/python-devpi-common.changes b/python-devpi-common.changes index 273c3f3..deea443 100644 --- a/python-devpi-common.changes +++ b/python-devpi-common.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 22 09:32:02 UTC 2023 - Dirk Müller + +- add unpin-versions.patch to reduce the packaging version conflict + ------------------------------------------------------------------- Mon Mar 6 17:21:35 UTC 2023 - Daniel Garcia diff --git a/python-devpi-common.spec b/python-devpi-common.spec index 8422fee..3187fa4 100644 --- a/python-devpi-common.spec +++ b/python-devpi-common.spec @@ -24,9 +24,11 @@ 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 setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-packaging Requires: python-py >= 1.4.20 Requires: python-requests >= 2.3.0 BuildArch: noarch @@ -42,7 +44,7 @@ BuildRequires: %{python_module requests >= 2.3.0} Utilities jointly used by devpi-server and devpi-client. %prep -%setup -q -n devpi-common-%{version} +%autosetup -p1 -n devpi-common-%{version} rm tox.ini %build diff --git a/unpin-versions.patch b/unpin-versions.patch new file mode 100644 index 0000000..a521b9c --- /dev/null +++ b/unpin-versions.patch @@ -0,0 +1,13 @@ +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.*",