Moved mkurl_pypi_url outside of find_requirement to allow for further untangling of code