Merge pull request #22034 from jefferyto/python-build-1.0.0