diff --git a/explicit-packaging.patch b/explicit-packaging.patch new file mode 100644 index 0000000..c5a9a9d --- /dev/null +++ b/explicit-packaging.patch @@ -0,0 +1,76 @@ +Index: python-daemon-3.0.1/pyproject.toml +=================================================================== +--- python-daemon-3.0.1.orig/pyproject.toml ++++ python-daemon-3.0.1/pyproject.toml +@@ -10,7 +10,9 @@ + # Minimum requirements for the build system. + requires = [ + "setuptools >=62.4.0", +- "docutils"] ++ "packaging", ++ "docutils", ++ ] + + # Path to the Python object to perform the build. + build-backend = "setuptools.build_meta" +Index: python-daemon-3.0.1/setup.py +=================================================================== +--- python-daemon-3.0.1.orig/setup.py ++++ python-daemon-3.0.1/setup.py +@@ -60,10 +60,13 @@ setup_kwargs = dict( + zip_safe=False, + setup_requires=[ + "docutils", ++ "setuptools", ++ "packaging", + ], + install_requires=[ + "setuptools >=62.4.0", + "lockfile >=0.10", ++ "packaging", + ], + python_requires=">=3", + extras_require={ +Index: python-daemon-3.0.1/test_version.py +=================================================================== +--- python-daemon-3.0.1.orig/test_version.py ++++ python-daemon-3.0.1/test_version.py +@@ -20,10 +20,10 @@ import unittest.mock + import docutils + import docutils.nodes + import docutils.writers ++from packaging.version import InvalidVersion + import setuptools + import setuptools.command + import setuptools.dist +-from setuptools.extern.packaging.version import InvalidVersion + import testscenarios + import testtools + +Index: python-daemon-3.0.1/version.py +=================================================================== +--- python-daemon-3.0.1.orig/version.py ++++ python-daemon-3.0.1/version.py +@@ -31,12 +31,12 @@ import re + import sys + import textwrap + ++import packaging.version + import setuptools + import setuptools.command.build + import setuptools.command.build_py + import setuptools.command.egg_info + import setuptools.dist +-import setuptools.extern.packaging.version + + + def ensure_class_bases_begin_with(namespace, class_name, base_class): +@@ -186,7 +186,7 @@ class ChangeLogEntry: + # A valid non-version value. + return None + +- valid_version = setuptools.extern.packaging.version.Version(value) ++ valid_version = packaging.version.Version(value) + + @classmethod + def validate_maintainer(cls, value): diff --git a/python-daemon-3.0.1.tar.gz b/python-daemon-3.0.1.tar.gz new file mode 100644 index 0000000..2a7a672 --- /dev/null +++ b/python-daemon-3.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5 +size 81337 diff --git a/python-python-daemon.changes b/python-python-daemon.changes index f2feb8e..a92f751 100644 --- a/python-python-daemon.changes +++ b/python-python-daemon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Sep 16 14:17:18 UTC 2024 - Daniel Garcia + +- Revert to 3.0.1. Version 3.0.2 was yanked from pypi because it + breaks setuptools + (https://pagure.io/python-daemon/issue/94, https://pypi.org/project/python-daemon/3.0.2/) +- Add patch explicit-packaging.patch to fix issue with current + setuptools: https://pagure.io/python-daemon/issue/73 + ------------------------------------------------------------------- Fri Aug 30 04:49:41 UTC 2024 - Steve Kowalik diff --git a/python-python-daemon.spec b/python-python-daemon.spec index 1ac0c8c..699185c 100644 --- a/python-python-daemon.spec +++ b/python-python-daemon.spec @@ -18,16 +18,21 @@ %{?sle15_python_module_pythons} Name: python-python-daemon -Version: 3.0.2 +Version: 3.0.1 Release: 0 Summary: Library to implement a well-behaved Unix daemon process License: Apache-2.0 AND GPL-3.0-only URL: https://pagure.io/python-daemon/ -Source: https://releases.pagure.org/python-daemon/python_daemon-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/python-daemon/python-daemon-%{version}.tar.gz +# Available since 3.0.2, that was yanked because of https://pagure.io/python-daemon/issue/94 +# Source: https://releases.pagure.org/python-daemon/python_daemon-%{version}.tar.gz +# PATCH-FIX-UPSTREAM explicit-packaging.patch https://pagure.io/python-daemon/c/d7bac6e +Patch0: explicit-packaging.patch BuildRequires: %{python_module docutils} BuildRequires: %{python_module lockfile >= 0.10} BuildRequires: %{python_module packaging} BuildRequires: %{python_module pip} +BuildRequires: %{python_module setuptools} BuildRequires: %{python_module testscenarios >= 0.4} BuildRequires: %{python_module testtools} BuildRequires: %{python_module wheel} @@ -49,7 +54,7 @@ holds the behaviour and configured process environment for the program; use the instance as a context manager to enter a daemon state. %prep -%autosetup -p1 -n python_daemon-%{version} +%autosetup -p1 -n python-daemon-%{version} sed -i '/docutils/d' setup.py @@ -64,9 +69,9 @@ sed -i '/docutils/d' setup.py %pyunittest discover -v %files %{python_files} -%license LICENSE.ASF-2 LICENSE.GPL-3 COPYING -%doc README ChangeLog +%license LICENSE.ASF-2 LICENSE.GPL-3 +%doc README ChangeLog doc/* %{python_sitelib}/daemon -%{python_sitelib}/python_daemon-%{version}.dist-info +%{python_sitelib}/python_daemon-%{version}*-info %changelog diff --git a/python_daemon-3.0.2.tar.gz b/python_daemon-3.0.2.tar.gz deleted file mode 100644 index 83565b4..0000000 --- a/python_daemon-3.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47027e6bf9b3685f31201f7bdd6dc6248713cd666267addf2b2efe0aa66a2b31 -size 70925