Reorder requirements to avoid pip-confusion