From 29a31cf080453093d75721d015112038d44c5922 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 26 Jun 2022 01:34:56 -0500 Subject: [PATCH] Removed unnecessarily vendored tomli. --- python-flit.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/python-flit.spec b/python-flit.spec index 1170f74..1a5c583 100644 --- a/python-flit.spec +++ b/python-flit.spec @@ -5,7 +5,7 @@ Name: python-%{srcname} Version: 3.7.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simplified packaging of Python modules # ./flit/log.py under ASL 2.0 license @@ -78,6 +78,8 @@ Recommends: python3-pygments Summary: PEP 517 build backend for packages using Flit %{?python_provide:%python_provide python3-%{srcname}-core} Conflicts: python3-%{srcname} < 2.1.0-2 +# We manually specify this, because it's bundled upstream and not in the metadata +Requires: python3-tomli %description -n python3-%{srcname}-core This provides a PEP 517 build backend for packages using Flit. @@ -88,6 +90,15 @@ at flit_core.buildapi. %prep %autosetup -p1 -n %{srcname}-%{version} +# Remove vendored tomli that flit_core includes to solve the circular dependency. +# (flit_core requires tomli, but flit_core is needed to build tomli). +# We don't use this, as python3-tomli already has its own bootstrap bcond +# to build without flit_core. +# +# flit's tests already require tomli, so we're pulling it in at buildtime anyways. +sed -i 's|from \.vendor import tomli|import tomli|' flit_core/flit_core/config.py +rm -rf flit_core/flit_core/vendor + %build export FLIT_NO_NETWORK=1 @@ -136,6 +147,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache %changelog +* Sun Jun 26 2022 Maxwell G - 3.7.1-4 +- Removed unnecessarily vendored tomli. + * Tue Jun 14 2022 Python Maint - 3.7.1-3 - Rebuilt for Python 3.11