[pypy-commit] buildbot default: fix for non-windows build slaves without git

mattip pypy.commits at gmail.com
Sun Dec 17 16:20:23 EST 2017


Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1052:054832151c19
Date: 2017-12-17 23:19 +0200
http://bitbucket.org/pypy/buildbot/changeset/054832151c19/

Log:	fix for non-windows build slaves without git

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -470,9 +470,11 @@
         if platform == 'win32':
             virt_pypy = r'..\venv\pypy-venv\Scripts\python.exe'
             clean = 'rmdir /s /q pypy-venv'
+            virt_package = 'git+git://github.com/pypa/virtualenv@master'
         else:
             virt_pypy = '../venv/pypy-venv/bin/python'
             clean = 'rm -rf pypy-venv'
+            virt_package = 'virtualenv'
         target = Property('target_path')
         factory.addStep(ShellCmd(
             description="ensurepip",
@@ -486,7 +488,7 @@
         factory.addStep(ShellCmd(
             description="Install recent virtualenv",
             command=prefix + [target, '-mpip', 'install', '--upgrade',
-                              'git+git://github.com/pypa/virtualenv@master'],
+                              virt_package],
             workdir='venv',
             flunkOnFailure=True))
         factory.addStep(ShellCmd(


More information about the pypy-commit mailing list