#441 [F38] Revert "CI: Use DNF 4 in mock to workaround dnf5#1084"
Merged 3 months ago by churchyard. Opened 3 months ago by churchyard.
rpms/ churchyard/pyproject-rpm-macros dnf5  into  f38

@@ -248,6 +248,14 @@ 

          # with pyproject.toml without a specified build backend.

          # If the default requirements change, also change them in the macro!

          requirements.add('setuptools >= 40.8', source='default build backend')

+         # PEP 517 doesn't mandate depending on wheel when the default backend is used.

+         # Historically, it used to be assumed as necessary, but later it turned out to be wrong.

+         # See the removal in pip and build:

+         #   https://github.com/pypa/pip/pull/12449

+         #   https://github.com/pypa/build/pull/716

+         # However, the requirement *will* be generated by setuptools anyway

+         # as part of get_requires_for_build_wheel().

+         # So we might as well keep it to skip one redundant step.

          requirements.add('wheel', source='default build backend')

  

      requirements.check(source='build backend')

file modified
-1
@@ -36,7 +36,6 @@ 

    cp $original $config

  

    echo -e '\n\n' >> $config

-   echo -e 'config_opts["package_manager"] = "dnf"' >> $config

    echo -e 'config_opts["package_manager_max_attempts"] = 10' >> $config

    echo -e 'config_opts["package_manager_attempt_delay"] = 60' >> $config

    echo -e '\n\nconfig_opts[f"{config_opts.package_manager}.conf"] += """' >> $config

no initial comment

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

Pull-Request has been merged by churchyard

3 months ago