[pypy-commit] buildbot default: use upgraded virtualenv for pypy -A tests, clean out old virtualenv's

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1040:be8418f6ed85
Date: 2017-11-22 23:03 +0200
http://bitbucket.org/pypy/buildbot/changeset/be8418f6ed85/

Log:	use upgraded virtualenv for pypy -A tests, clean out old
	virtualenv's

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -473,15 +473,21 @@
         else:
             virt_pypy = '../venv/pypy-venv/bin/python'
             clean = 'rm -rf pypy-env'
+        target = Property('target_path')
         factory.addStep(ShellCmd(
             description="clean old virtualenv",
             command=clean,
             workdir='venv',
             haltOnFailure=False))
         factory.addStep(ShellCmd(
+            description="Install recent virtualenv",
+            command=prefix + [target, '-mpip', 'install', '--upgrade',
+                              'virtualenv'],
+            workdir='venv',
+            flunkOnFailure=True))
+        factory.addStep(ShellCmd(
             description="Create virtualenv",
-            command=prefix + ['virtualenv', '--clear', '-p',
-                Property('target_path'), 'pypy-venv'],
+            command=prefix + [target, '-mvirtualenv', '--clear', 'pypy-venv'],
             workdir='venv',
             flunkOnFailure=True))
         factory.addStep(ShellCmd(
@@ -555,17 +561,22 @@
             haltOnFailure=False,
             ))
 
+        if platform == 'win32':
+            self.virt_python = r'virt_test\Scripts\python.exe'
+            clean = 'rmdir /s /q virt-test'
+        else:
+            self.virt_python = 'virt_test/bin/python'
+            clean = 'rm -rf virt-test'
+        self.addStep(ShellCmd(
+            description="clean old virtualenv",
+            command=clean,
+            haltOnFailure=False))
         self.addStep(ShellCmd(
             description="create virtualenv for tests",
             command=['virtualenv', 'virt_test'],
             haltOnFailure=True,
             ))
 
-        if platform == 'win32':
-            self.virt_python = r'virt_test\Scripts\python.exe'
-        else:
-            self.virt_python = 'virt_test/bin/python'
-
         self.addStep(ShellCmd(
             description="install requirments to virtual environment",
             command=[self.virt_python, '-mpip', 'install', '-r',