python_dependency: cleanup, fix satisfy.

Closes #26067.
Merge remote-tracking branch 'upstream/master'