Merge "Use upper constraints in pep8 test run"