Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

python/hooks: restore catchConflictHook for python<3.10 #267669

Merged
merged 2 commits into from
Nov 18, 2023
Merged

python/hooks: restore catchConflictHook for python<3.10 #267669

merged 2 commits into from
Nov 18, 2023

Commits on Nov 18, 2023

  1. python/hooks: restore catchConflictHook for python<3.10 

    By restoring and diverting to the old version.

Previously the newer language features and use of more modern stdlib
imports broke the hook on Python<3.10.
    @mweinelt
    mweinelt committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    f292ef4 View commit details
    Browse the repository at this point in the history

  2. Revert "python2/mk-python-derivation: disable catchConflictsHook" 

    This reverts commit 397a8fd.

The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
    @mweinelt
    mweinelt committed Nov 18, 2023
    Configuration menu
    Copy the full SHA
    d9327a5 View commit details
    Browse the repository at this point in the history