From 8675fa775d0dedd74bab475c498030b3a973d6a1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 14 Jan 2022 14:21:19 -0700 Subject: [PATCH] Update python macros. --- python-networkx.rpmlintrc | 11 ----------- python-networkx.spec | 6 ++++-- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 python-networkx.rpmlintrc diff --git a/python-networkx.rpmlintrc b/python-networkx.rpmlintrc deleted file mode 100644 index 00a7adb..0000000 --- a/python-networkx.rpmlintrc +++ /dev/null @@ -1,11 +0,0 @@ -# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON -# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors - -# Zip files are not text -addFilter(r'W: file-not-utf8 .*.zip') - -# Dangling font symlinks: the Requires ensures they will not dangle -addFilter(r'W: dangling-symlink .*fonts') - -# We use the versions of jquery and js-underscore that sphinx gives us -addFilter(r'W: unversioned-explicit-provides bundled\((jquery|js-underscore)\)') diff --git a/python-networkx.spec b/python-networkx.spec index d2dde09..ec3792a 100644 --- a/python-networkx.spec +++ b/python-networkx.spec @@ -24,8 +24,10 @@ BuildRequires: python3-devel BuildRequires: %{py3_dist matplotlib} BuildRequires: %{py3_dist numpy} BuildRequires: %{py3_dist pandas} +BuildRequires: %{py3_dist pip} BuildRequires: %{py3_dist scipy} BuildRequires: %{py3_dist setuptools} +BuildRequires: %{py3_dist wheel} %if 0%{?rhel} == 0 BuildRequires: python-pygraphviz-doc @@ -105,7 +107,7 @@ sed -e 's|\("https://docs\.python\.org/3/", \)None|\1"%{_docdir}/python3-docs/ht -i doc/conf.py %build -%py3_build +%pyproject_wheel %if 0%{?rhel} == 0 # Build the documentation @@ -114,7 +116,7 @@ rst2html --no-datestamp README.rst README.html %endif %install -%py3_install +%pyproject_install mv %{buildroot}%{_docdir}/networkx-%{version} ./installed-docs rm -f installed-docs/INSTALL.txt