Run pep8 only for current builder

pep8 is install from requirements-testing.pip, so remove that line and
make sure pep8 is run after processing requirements.

1 files changed, 8 insertions, 6 deletions

diff --git a/master.cfg b/master.cfg
index 418f98b..341e9f0 100644
--- a/master.cfg
+++ b/master.cfg
@@ -96,10 +96,9 @@ def add_repo_to_factory(factory, repo_name, git_branch, namespace, venv_name):
     sandbox_path_soledad = {'PATH':  "../../" + venv_name + '/bin/' + ':${PATH}'}
     repo_url = github_repo_url(repo_name)
 
-    factory.addSteps([
-        Git(repourl=repo_url, branch=git_branch, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url),
-        ShellCommand(command=['pep8', '--exclude=setup.py,versioneer.py,src._version', '--ignore=E501', '.'],env=sandbox_path,haltOnFailure=False, workdir=workdir, name="pep8 on " + repo_name)
-    ])
+    factory.addStep(
+        Git(repourl=repo_url, branch=git_branch, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url))
+
     if 'bitmask_client' in repo_name:
         factory.addStep(ShellCommand(command='pkg/postmkvenv.sh',env=sandbox_path,haltOnFailure=False, workdir=workdir, name="postmkenv"))
     if 'soledad.git' in repo_url:
@@ -126,14 +125,16 @@ def create_builder(repo_name):
     factory.addSteps([
         ShellCommand(command=["rm", "-rf", venv_name], haltOnFailure=True, workdir=".", name="Remove previous virtualenv"),
         ShellCommand(command=["virtualenv", "--python=python2", venv_name], haltOnFailure=True, workdir=".", name="Create new virtualenv"),
-        ShellCommand(command=['pip', 'install', '-U', 'pip', 'setuptools'], env=venv_path, workdir=".", name="Update setuptools"),
-        ShellCommand(command=['pip', 'install', '--upgrade', 'pep8'], env=venv_path, workdir=".", name="Install pep8")
+        ShellCommand(command=['pip', 'install', '-U', 'pip', 'setuptools'], env=venv_path, workdir=".", name="Update setuptools")
     ])
 
     repo_index = [repo[order_repos_index] for repo in REPOS if repo[0] is repo_name][0]
     for repo_name, repo_branch, _, namespace, in sorted(REPOS, key = lambda repo: repo[order_repos_index])[0:repo_index]:
         add_repo_to_factory(factory, repo_name, repo_branch, namespace, venv_name)
 
+    factory.addStep(
+        ShellCommand(command=['pep8', '--exclude=setup.py,versioneer.py,src._version', '--ignore=E501', '.'],env=venv_path_factory,haltOnFailure=False, workdir="workdir-" + repo_name, name="pep8 on " + repo_name))
+
     if namespace is not '':
         factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir="workdir-" + repo_name, name="trial "+namespace))
 
@@ -220,3 +221,4 @@ c['db'] = {
     # this at its default for all but the largest installations.
     'db_url' : "sqlite:///state.sqlite",
 }
+x