pip version check redux

Closes #1973 which followed up on #1214.