From 2a58d554d3002dc5116fbde0514dbb7882d487be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 16:05:29 +0000 Subject: [PATCH 1/8] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-tomli-w.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 79dc155..1393bd3 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -10,7 +10,7 @@ Name: python-tomli-w Version: 0.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Python library for writing TOML License: MIT @@ -70,6 +70,9 @@ Summary: %{summary} %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 0.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 20 2022 Michel Alexandre Salim - 0.4.0-2 - Add boostrap and check toggles to ease bootstrapping new EPEL releases From 6288a467948680660f5fa68aa419939c26b38dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 22 Jan 2022 00:04:21 +0100 Subject: [PATCH 2/8] Don't overuse macros, it makes the spec file harder to read --- python-tomli-w.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 1393bd3..66273a8 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -6,8 +6,6 @@ %bcond_without check %endif -%global modname tomli_w - Name: python-tomli-w Version: 0.4.0 Release: 3%{?dist} @@ -51,7 +49,7 @@ Summary: %{summary} %install %pyproject_install -%pyproject_save_files %{modname} +%pyproject_save_files tomli_w %check @@ -59,7 +57,7 @@ Summary: %{summary} %tox %else # no %%pyproject_check_import on EL9 -%py3_check_import %{modname} +%py3_check_import tomli_w %endif From f992aa1af94aa077e63b90a992658be318bf3107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 22 Jan 2022 00:13:55 +0100 Subject: [PATCH 3/8] Simplify %generate_buildrequires --- python-tomli-w.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 66273a8..764acce 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -36,11 +36,7 @@ Summary: %{summary} %generate_buildrequires -%if %{with check} -%pyproject_buildrequires -t -%else -%pyproject_buildrequires -%endif +%pyproject_buildrequires %{?with_check:-t} %build From e96ffc45c908831ba5cd6c56b8a638e242daed63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 22 Jan 2022 00:14:52 +0100 Subject: [PATCH 4/8] No reason for a nested bcond --- python-tomli-w.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 764acce..665a51c 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -1,10 +1,4 @@ -%bcond_with bootstrap - -%if %{with bootstrap} -%bcond_with check -%else %bcond_without check -%endif Name: python-tomli-w Version: 0.4.0 From b5996ef1085b509d74d3e0ecaea1fd942bd2cbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 4 Feb 2022 13:38:46 +0100 Subject: [PATCH 5/8] %pyproject_check_import is available on EL9 --- python-tomli-w.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 665a51c..9a69b31 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -43,11 +43,9 @@ Summary: %{summary} %check +%pyproject_check_import tomli_w %if %{with check} %tox -%else -# no %%pyproject_check_import on EL9 -%py3_check_import tomli_w %endif From 5dfc1e520259ea6e391979b559db7f1242ac74cf Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Sun, 6 Mar 2022 16:40:50 -0800 Subject: [PATCH 6/8] Disable checks on EPEL, since there are too many missing BRs Signed-off-by: Michel Alexandre Salim --- python-tomli-w.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index 9a69b31..d53fde5 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -1,4 +1,9 @@ +%if 0%{?rhel} +# many missing test dependencies that we don't want to maintain +%bcond_with check +%else %bcond_without check +%endif Name: python-tomli-w Version: 0.4.0 From 01ed1aafc47564b2a6abbad0daf725c1efdffca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Mar 2022 21:03:22 +0100 Subject: [PATCH 7/8] Drop BR on pytest-cov --- python-tomli-w.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index d53fde5..a49adca 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -32,6 +32,8 @@ Summary: %{summary} %prep %autosetup -p1 -n tomli-w-%{version} +# Measuring coverage is discouraged in Python packaging guidelines: +sed -i '/pytest-cov/d' tests/requirements.txt %generate_buildrequires From b0740428c09fb2a5ca536d49c97be031b815c77b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Mar 2022 21:08:30 +0100 Subject: [PATCH 8/8] Allow %check on EL branches, just don't BR pytest-randomly --- python-tomli-w.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python-tomli-w.spec b/python-tomli-w.spec index a49adca..71860b8 100644 --- a/python-tomli-w.spec +++ b/python-tomli-w.spec @@ -1,9 +1,4 @@ -%if 0%{?rhel} -# many missing test dependencies that we don't want to maintain -%bcond_with check -%else %bcond_without check -%endif Name: python-tomli-w Version: 0.4.0 @@ -34,6 +29,11 @@ Summary: %{summary} %autosetup -p1 -n tomli-w-%{version} # Measuring coverage is discouraged in Python packaging guidelines: sed -i '/pytest-cov/d' tests/requirements.txt +# This testing dependency is optional and we don't have it in (EP)EL, +# it has many missing transitive dependencies that we don't want to maintain +%if 0%{?rhel} +sed -i '/pytest-randomly/d' tests/requirements.txt +%endif %generate_buildrequires