rpms/pyproject-rpm-macros
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename %_pyproject_ghost_distinfo and %_pyproject_record to indicate they are private

Browse Source 
Related: rhbz#1950291
This commit is contained in:
Miro Hrončok 2021-07-23 08:01:13 +00:00
parent a3a1caf32a
commit 309172f9a8
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
macros.pyproject
View File

@ -11,8 +11,8 @@
%_pyproject_builddir %{_builddir}%{?buildsubdir:/%{buildsubdir}}/.pyproject-builddir %_pyproject_builddir %{_builddir}%{?buildsubdir:/%{buildsubdir}}/.pyproject-builddir
%pyproject_files %{_builddir}/pyproject-files %pyproject_files %{_builddir}/pyproject-files
%pyproject_ghost_distinfo %{_builddir}/pyproject-ghost-distinfo %_pyproject_ghost_distinfo %{_builddir}/pyproject-ghost-distinfo
%pyproject_record %{_builddir}/pyproject-record %_pyproject_record %{_builddir}/pyproject-record
# Avoid leaking %%{_pyproject_builddir} to pytest collection # Avoid leaking %%{_pyproject_builddir} to pytest collection
# https://bugzilla.redhat.com/show_bug.cgi?id=1935212 # https://bugzilla.redhat.com/show_bug.cgi?id=1935212
@ -34,7 +34,7 @@ if [ -d %{buildroot}%{_bindir} ]; then
%py3_shebang_fix %{buildroot}%{_bindir}/* %py3_shebang_fix %{buildroot}%{_bindir}/*
rm -rfv %{buildroot}%{_bindir}/__pycache__ rm -rfv %{buildroot}%{_bindir}/__pycache__
fi fi
rm -f %{pyproject_ghost_distinfo} rm -f %{_pyproject_ghost_distinfo}
site_dirs=() site_dirs=()
# Process %%{python3_sitelib} if exists # Process %%{python3_sitelib} if exists
if [ -d %{buildroot}%{python3_sitelib} ]; then if [ -d %{buildroot}%{python3_sitelib} ]; then
@ -47,25 +47,25 @@ fi
# Process all *.dist-info dirs in sitelib/sitearch # Process all *.dist-info dirs in sitelib/sitearch
for site_dir in ${site_dirs[@]}; do for site_dir in ${site_dirs[@]}; do
for distinfo in %{buildroot}$site_dir/*.dist-info; do for distinfo in %{buildroot}$site_dir/*.dist-info; do
echo "%ghost ${distinfo#%{buildroot}}" >> %{pyproject_ghost_distinfo} echo "%ghost ${distinfo#%{buildroot}}" >> %{_pyproject_ghost_distinfo}
sed -i 's/pip/rpm/' ${distinfo}/INSTALLER sed -i 's/pip/rpm/' ${distinfo}/INSTALLER
PYTHONPATH=%{_rpmconfigdir}/redhat \\ PYTHONPATH=%{_rpmconfigdir}/redhat \\
%{__python3} -B %{_rpmconfigdir}/redhat/pyproject_preprocess_record.py \\ %{__python3} -B %{_rpmconfigdir}/redhat/pyproject_preprocess_record.py \\
--buildroot %{buildroot} --record ${distinfo}/RECORD --output %{pyproject_record} --buildroot %{buildroot} --record ${distinfo}/RECORD --output %{_pyproject_record}
rm -fv ${distinfo}/RECORD rm -fv ${distinfo}/RECORD
rm -fv ${distinfo}/REQUESTED rm -fv ${distinfo}/REQUESTED
done done
done done
lines=$(wc -l %{pyproject_ghost_distinfo} | cut -f1 -d" ") lines=$(wc -l %{_pyproject_ghost_distinfo} | cut -f1 -d" ")
if [ $lines -ne 1 ]; then if [ $lines -ne 1 ]; then
echo -e "\\n\\nWARNING: %%%%pyproject_extras_subpkg won't work without explicit -i or -F, found $lines dist-info directories.\\n\\n" >&2 echo -e "\\n\\nWARNING: %%%%pyproject_extras_subpkg won't work without explicit -i or -F, found $lines dist-info directories.\\n\\n" >&2
rm %{pyproject_ghost_distinfo} # any attempt to use this will fail rm %{_pyproject_ghost_distinfo} # any attempt to use this will fail
fi fi
} }
# Note: the three times nested questionmarked -i -f -F pattern means: If none of those options was used -- in that case, we inject our own -f # Note: the three times nested questionmarked -i -f -F pattern means: If none of those options was used -- in that case, we inject our own -f
%pyproject_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{pyproject_ghost_distinfo}}}} %**}}} %pyproject_extras_subpkg(n:i:f:F) %{expand:%{?python_extras_subpkg:%{python_extras_subpkg%{?!-i:%{?!-f:%{?!-F: -f %{_pyproject_ghost_distinfo}}}} %**}}}
%pyproject_save_files() %{expand:\\\ %pyproject_save_files() %{expand:\\\
@ -75,7 +75,7 @@ fi
--sitelib "%{python3_sitelib}" \\ --sitelib "%{python3_sitelib}" \\
--sitearch "%{python3_sitearch}" \\ --sitearch "%{python3_sitearch}" \\
--python-version "%{python3_version}" \\ --python-version "%{python3_version}" \\
--pyproject-record "%{pyproject_record}" \\ --pyproject-record "%{_pyproject_record}" \\
%{*} %{*}
} }

1
pyproject-rpm-macros.spec
View File

@ -121,6 +121,7 @@ export HOSTNAME="rpmbuild" # to speedup tox in network-less mock, see rhbz#1856
%changelog %changelog
* Fri Jul 23 2021 Miro Hrončok <miro@hroncok.cz> - 0-46 * Fri Jul 23 2021 Miro Hrončok <miro@hroncok.cz> - 0-46
- %%pyproject_buildrequires now fails when it encounters an invalid requirement - %%pyproject_buildrequires now fails when it encounters an invalid requirement
- Rename %%_pyproject_ghost_distinfo and %%_pyproject_record to indicate they are private
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0-45 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0-45
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

6
tests/python-setuptools_scm.spec
View File

@ -59,9 +59,9 @@ grep -F 'py%{python3_version_nodots}-test: commands succeeded' toxlog
grep -F 'flake8: commands succeeded' toxlog grep -F 'flake8: commands succeeded' toxlog
# Internal check for our macros # Internal check for our macros
# making sure that %%{pyproject_ghost_distinfo} has the right content # making sure that %%{_pyproject_ghost_distinfo} has the right content
test -f %{pyproject_ghost_distinfo} test -f %{_pyproject_ghost_distinfo}
test "$(cat %{pyproject_ghost_distinfo})" == "%ghost %{python3_sitelib}/setuptools_scm-%{version}.dist-info" test "$(cat %{_pyproject_ghost_distinfo})" == "%ghost %{python3_sitelib}/setuptools_scm-%{version}.dist-info"
%files -n python3-setuptools_scm -f %{pyproject_files} %files -n python3-setuptools_scm -f %{pyproject_files}