rpms / pyproject-rpm-macros

Clone
Source Code
GIT

#428 Show a better error message when %pyproject_install finds no wheel
Merged 6 months ago by churchyard. Opened 6 months ago by churchyard.
rpms/ churchyard/pyproject-rpm-macros install_fail_messsage  into  rawhide

file modified
+4 
@@ -65,6 +65,10 @@ 
 

  

  %pyproject_install() %{expand:\\\
 

  specifier=$(ls %{_pyproject_wheeldir}/*.whl | xargs basename --multiple | sed -E 's/([^-]+)-([^-]+)-.+\\\.whl/\\\1==\\\2/')
 

+ if [ -z $specifier ]; then
 

+   echo 'ERROR: %%%%pyproject_install found no wheel in %%%%{_pyproject_wheeldir} %{_pyproject_wheeldir}' >&2
 

+   exit 1
 

+ fi
 

  TMPDIR="%{_pyproject_builddir}" %{__python3} -m pip install --root %{buildroot} --prefix %{_prefix} --no-deps --disable-pip-version-check --progress-bar off --verbose --ignore-installed --no-warn-script-location --no-index --no-cache-dir --find-links %{_pyproject_wheeldir} $specifier
 

  if [ -d %{buildroot}%{_bindir} ]; then
 

    %py3_shebang_fix %{buildroot}%{_bindir}/*

file modified
+2 
@@ -177,6 +177,8 @@ 
 

  - The -L flag explicitly disables this check (which remains the default)
 

  - Prevent incorrect usage of %%pyproject_buildrequires -R with -x/-e/-t
 

  - Fixes: rhbz#2244282
 

+ - Show a better error message when %%pyproject_install finds no wheel
 

+ - Fixes: rhbz#2242452
 

  

  * Wed Sep 13 2023 Python Maint <python-maint@redhat.com> - 1.10.0-1
 

  - Add %%_pyproject_check_import_allow_no_modules for automated environments

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/7c15d270d5624aa3a78a0ff6b7d8f92a

4 new commits added

  • Show a better error message when %pyproject_install finds no wheel
  • Prevent incorrect usage of %pyproject_buildrequires -R with -x/-e/-t/-w/-C
  • CI: Use DNF 4 in mock to workaround dnf5#1084
  • Add the -l/-L flag to %pyproject_save_files
6 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/0e6b2da025dc402390139dcf93dd5368

4 new commits added

  • Show a better error message when %pyproject_install finds no wheel
  • Prevent incorrect usage of %pyproject_buildrequires -R with -x/-e/-t/-w
  • CI: Use DNF 4 in mock to workaround dnf5#1084
  • Add the -l/-L flag to %pyproject_save_files
6 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/954c7b67db384dffbc23392bd6de2986

The Release in the specfile is bumped, but the changelog entry was added to the previous one.

I've verified it works with the reproducer from bugzilla, nice!

4 new commits added

  • Show a better error message when %pyproject_install finds no wheel
  • Prevent incorrect usage of %pyproject_buildrequires -R with -x/-e/-t
  • CI: Use DNF 4 in mock to workaround dnf5#1084
  • Add the -l/-L flag to %pyproject_save_files
6 months ago

The Release in the specfile is bumped, but the changelog entry was added to the previous one.

Oh, I keep rebasing this and the release field was automatically bumped by https://github.com/encukou/rpm-spec-merge-driver :/

Amended.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/ee3429e7614d4b9389b31e10d6f2572d

The Release in the specfile is bumped, but the changelog entry was added to the previous one.

Oh, I keep rebasing this and the release field was automatically bumped by https://github.com/encukou/rpm-spec-merge-driver :/

Amended.

Thank you, all looks fine here.

rebased onto 89c9b40
6 months ago

Pull-Request has been merged by churchyard
6 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/02118ae3eb7e4ab19320ece4b4679198
Metadata
None
No Tags
Changes Summary 2
+4 -0
file changed
macros.pyproject
+2 -0
file changed
pyproject-rpm-macros.spec
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.