From 9cf1aaf7b06ce743bd11f7c685141301ad4da648 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 9 Feb 2024 10:43:22 +0100 Subject: [PATCH] Apply workaround for old poetry with sed [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-0.6.0-old-poetry.patch | 12 ------------ python-rpmautospec.spec | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 python-rpmautospec-0.6.0-old-poetry.patch diff --git a/python-rpmautospec-0.6.0-old-poetry.patch b/python-rpmautospec-0.6.0-old-poetry.patch deleted file mode 100644 index 929d2b5..0000000 --- a/python-rpmautospec-0.6.0-old-poetry.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up rpmautospec-0.6.0/pyproject.toml.old-poetry rpmautospec-0.6.0/pyproject.toml ---- rpmautospec-0.6.0/pyproject.toml.old-poetry 2024-01-27 10:16:00.742831700 +0100 -+++ rpmautospec-0.6.0/pyproject.toml 2024-01-27 11:11:14.965480544 +0100 -@@ -47,7 +47,7 @@ babel = "^2.9" - pygit2 = "^1.4.0" - rpm = "*" - --[tool.poetry.group.dev.dependencies] -+[tool.poetry.dev-dependencies] - pyyaml = "^5.3.1 || ^6" - pytest = "^6.2.2 || ^7" - pytest-cov = "^4.0.0" diff --git a/python-rpmautospec.spec b/python-rpmautospec.spec index c0e8f01..c2578ce 100644 --- a/python-rpmautospec.spec +++ b/python-rpmautospec.spec @@ -25,7 +25,6 @@ Summary: Package and CLI tool to generate release fields and changelogs License: MIT URL: https://github.com/fedora-infra/%{canonicalname} Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz -Patch100: python-rpmautospec-0.6.0-old-poetry.patch BuildArch: noarch BuildRequires: git @@ -73,10 +72,11 @@ enabled packages locally. %pyproject_buildrequires %prep -%autosetup -n %{srcname}-%{version} -N -%autopatch -M 99 +%autosetup -n %{srcname}-%{version} %if %{with oldpoetry} -%autopatch 100 +sed -i \ + -e 's/\[tool\.poetry\.group\.dev\.dependencies\]/[tool.poetry.dev-dependencies]/g' \ + pyproject.toml %endif # https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters