[pypy-commit] buildbot default: cleanup, add ensurepip step for TranslatedTests (downloading only) builders (ARM)

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r1044:a64690c374cf
Date: 2017-11-25 19:55 +0200
http://bitbucket.org/pypy/buildbot/changeset/a64690c374cf/

Log:	cleanup, add ensurepip step for TranslatedTests (downloading only)
	builders (ARM)

	builders that translate call ensurepip as part of translation and in
	packaging

diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/builds.py
+++ b/bot2/pypybuildbot/builds.py
@@ -475,6 +475,10 @@
             clean = 'rm -rf pypy-venv'
         target = Property('target_path')
         factory.addStep(ShellCmd(
+            description="ensurepip",
+            command=prefix + [target, '-mensurepip'],
+            flunkOnFailure=True))
+        factory.addStep(ShellCmd(
             description="clean old virtualenv",
             command=clean,
             workdir='venv',
@@ -750,12 +754,6 @@
             haltOnFailure=True,
             workdir='.'))
         self.addStep(ShellCmd(
-            description="copy ctypes resource cache",
-            # eventually remove this step, not needed after 5.1
-            command=['cp', '-rv', 'pypy-c/lib_pypy/ctypes_config_cache', 'build/lib_pypy'],
-            haltOnFailure=False,
-            workdir='.'))
-        self.addStep(ShellCmd(
             description="copy cffi import libraries",
             command='cp -rv pypy-c/lib_pypy/*.so build/lib_pypy',
             haltOnFailure=True,