From 196bc9049dde53eabb625301922623075612fb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 17 Jul 2021 15:06:23 +0200 Subject: [PATCH] All supported Fedoras can have dependencies on extras --- macros.pyproject | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/macros.pyproject b/macros.pyproject index e8cc8a6..13d3125 100644 --- a/macros.pyproject +++ b/macros.pyproject @@ -105,16 +105,10 @@ else echo 'ERROR: Neither pyproject.toml nor setup.py found, consider using %%%%pyproject_buildrequires -N if this is not a Python package.' >&2 exit 1 fi} -# Check if we can generate dependencies on Python extras -if [ "%{py_dist_name []}" == "[]" ]; then - extras_flag=%{?!_python_no_extras_requires:--generate-extras} -else - extras_flag= -fi # setuptools assumes no pre-existing dist-info rm -rfv *.dist-info/ >&2 if [ -f %{__python3} ]; then - RPM_TOXENV="%{toxenv}" HOSTNAME="rpmbuild" %{__python3} -s %{_rpmconfigdir}/redhat/pyproject_buildrequires.py $extras_flag --python3_pkgversion %{python3_pkgversion} %{?**} + RPM_TOXENV="%{toxenv}" HOSTNAME="rpmbuild" %{__python3} -s %{_rpmconfigdir}/redhat/pyproject_buildrequires.py %{?!_python_no_extras_requires:--generate-extras} --python3_pkgversion %{python3_pkgversion} %{?**} fi }