Since we bumped to python 3.12, setuptools is no longer provided by default: https://docs.python.org/3.12/whatsnew/3.12.html#ensurepip Declare this explicitly.
Also bypass certvalidator's custom test loader using unittest, until this upstream patch makes it into our Guix time machine commit.
Commits split to allow easy reversion of only the imp test loader patch.
Fixes: #36421
Since we bumpted to python 3.12, setuptools is no longer provided by
default:
https://docs.python.org/3.12/whatsnew/3.12.html#ensurepip
> easy_install, pkg_resources, setuptools and distutils are no longer
> provided by default in environments created with venv or bootstrapped
> with ensurepip, since they are part of the setuptools package. For
> projects relying on these at runtime, the setuptools project should be
> declared as a dependency and installed separately (typically, using
> pip).
Guix now uses Python 3.12, which removed the imp module.
Certvalidator's custom test runner imports imp and fails before running
any tests, preventing the macOS codesigning environment from building.
Use unittest discovery to run the existing suite and remove the unused
imp import from its package initializer. Keep the existing test skips.
This workaround can be removed when the certvalidator source has a test
loader compatible with Python 3.12.
Split from the previous commit to allow easy reversion in the future
when upstream changes flow down.
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline and AI policy for information on the review process. A summary of reviews will appear here.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
Reviewers can test building the codesign manifest without codesigning as per #36421 report:
HOST=x86_64-apple-darwin guix time-machine --url=https://codeberg.org/guix/guix.git --commit=60f6956aeffa7f30285745bd0ea615e9acfc74f8 -- build --manifest=contrib/guix/manifest_codesign.scm --keep-failed
Tested 82a8c8009a2b01c63a9d14c1f6ab3a3c232a27b5 on RISC-V hardware:
$ uname -a
Linux starfive 6.6.20-starfive [#1](/bitcoin-bitcoin/1/) SMP Sun May 5 22:39:25 CST 2024 riscv64 GNU/Linux
$ HOST=x86_64-apple-darwin guix time-machine --url=https://codeberg.org/guix/guix.git --commit=60f6956aeffa7f30285745bd0ea615e9acfc74f8 -- build --manifest=contrib/guix/manifest_codesign.scm --keep-failed
/gnu/store/gxs9c0jdqc43a1crvmr3gj4agnz31ax9-python-signapple-0.2.0-1.3fab3bb
/gnu/store/bj7ym082fay6nydzrlb5kzxkx6154h1x-git-minimal-2.54.0
/gnu/store/y8s5pl8b1jhb8dv417ivv7y2lf0q4m1s-zip-3.0
/gnu/store/z4jrhc9sadxsllvxvqn65fk7szdh6z9j-gzip-1.14
/gnu/store/bfxwpi7kzj7c8qhmkkay5mwjcsynqxs4-tar-1.35
/gnu/store/33m1f69x9g9m4fbg6kvdq2i5x486d159-findutils-4.10.0
/gnu/store/lbk75r1f1amqad62ywf88kg10i957q9b-coreutils-minimal-9.1
/gnu/store/2qfgs05zdmjy915ydfazcc1dlgbgp5p2-bash-minimal-5.2.37-doc
/gnu/store/qf0vnbskv0ryfpmkgs4smh34ms3nb0lk-bash-minimal-5.2.37
82a8c8009a2b01c63a9d14c1f6ab3a3c232a27b5
Does it make sense to rebase https://github.com/achow101/certvalidator/tree/allow-more-criticals onto https://github.com/wbond/certvalidator/tree/master, which already includes a fix for Python 3.12+?