Bringing setup.py into line with requirements.txt