Looks like you are making progress.  Some concern here about deletion of "python2-minimal python2" in the diff file only because I vaguely remember some confusion about python 3 vs 2, but that was some time ago.