[pypy-commit] buildbot default: use os tools to clean out old virtualenv (untested)

[mattip]

Author: Matti Picus <matti.pi...@gmail.com>
Branch: 
Changeset: r1039:0b37e98f8694
Date: 2017-11-08 03:00 +0200
http://bitbucket.org/pypy/buildbot/changeset/0b37e98f8694/

Log:    use os tools to clean out old virtualenv (untested)

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -467,16 +467,23 @@
             timeout=4000,
             env={"TMPDIR": Interpolate('%(prop:target_tmpdir)s' + pytest),
                 }))
+        if platform == 'win32':
+            virt_pypy = r'..\venv\pypy-venv\Scripts\python.exe'
+            clean = 'rmdir /s /q pypy-venv'
+        else:
+            virt_pypy = '../venv/pypy-venv/bin/python'
+            clean = 'rm -rf pypy-env'
+        factory.addStep(ShellCmd(
+            description="clean old virtualenv",
+            command=clean,
+            workdir='venv',
+            haltOnFailure=False))
         factory.addStep(ShellCmd(
             description="Create virtualenv",
             command=prefix + ['virtualenv', '--clear', '-p',
                 Property('target_path'), 'pypy-venv'],
             workdir='venv',
             flunkOnFailure=True))
-        if platform == 'win32':
-            virt_pypy = r'..\venv\pypy-venv\Scripts\python.exe'
-        else:
-            virt_pypy = '../venv/pypy-venv/bin/python'
         factory.addStep(ShellCmd(
             description="Install extra tests requirements",
             command=prefix + [virt_pypy, '-m', 'pip', 'install',
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit