Expand our regex to support the new PEP 440 version characters

Fixes #2203