temporary workaround for pypa/virtualenv#929

twisted-infra · Jun 3, 2016 · 038cb1a · 038cb1a
1 parent 4020d4d
commit 038cb1a
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/services/buildbot/master/twisted_factories.py b/services/buildbot/master/twisted_factories.py
@@ -200,14 +200,22 @@ def __init__(self, python, source, uncleanWarnings, trialTests=None,
         self.trialTests = trialTests
 
         if virtualenv:
-            # Each time we create a new virtualenv as latest pip can build
-            # wheels on the fly and install them from user's cache.
+            # Hopefully temporary workaround for --clear not working:
+            # https://github.com/pypa/virtualenv/issues/929
             self.addStep(
                 shell.ShellCommand,
                 command = self.python + [
-                    "-m", virtualenv_module, '--clear', self._virtualEnvPath,
-                    ],
-                )
+                    "-c", "import shutil, sys;"
+                    "shutil.rmtree(sys.argv[1], ignore_errors=True)",
+                    self._virtualEnvPath,
+                ]
+            )
+            self.addStep(
+                shell.ShellCommand,
+                command = self.python + [
+                    "-m", virtualenv_module, self._virtualEnvPath,
+                ]
+            )
 
         else:
             # Report the versions, since we're using the system ones. If it's a