Sync requirements and fix pep8 errors

Sync the requirements from the global list and
fix a few pep8 issues caused by not using the
proper template for creating the repository.

Change-Id: I5407712c34f35d4699aed130fcd0877414b6bc2c