From a3637c193dfdf18f812d2188fa19f0719280d189 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 25 Jun 2019 18:51:11 -0400
Subject: [PATCH] try telling the virtualenv to use pypy

---
 .circleci/Dockerfile.pypy      | 2 +-
 .circleci/config.yml           | 6 +++++-
 .circleci/create-virtualenv.sh | 7 ++++++-
 .circleci/prepare-image.sh     | 7 ++++++-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.circleci/Dockerfile.pypy b/.circleci/Dockerfile.pypy
index 0772b95a0..0dec74e79 100644
--- a/.circleci/Dockerfile.pypy
+++ b/.circleci/Dockerfile.pypy
@@ -20,4 +20,4 @@ RUN apt-get --quiet update && \
 # *update* this checkout on each job run, saving us more time per-job.
 COPY . ${BUILD_SRC_ROOT}
 
-RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"
+RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}" "pypy2.7"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72ca674f5..4df0f4df3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,11 @@ workflows:
       # - "slackware-14.2"
 
       # Test against PyPy 2.7/7.1.1
-      - "pypy2.7-7.1"
+      - "build-image-pypy-2.7-7.1.1-jessie"
+      - "pypy2.7-7.1":
+          # Just until I'm satisfied the image is being built right
+          requires:
+            - "build-image-pypy-2.7-7.1.1-jessie"
 
       # # Other assorted tasks and configurations
       # - "lint"
diff --git a/.circleci/create-virtualenv.sh b/.circleci/create-virtualenv.sh
index a18fdf614..1301bea76 100755
--- a/.circleci/create-virtualenv.sh
+++ b/.circleci/create-virtualenv.sh
@@ -13,9 +13,14 @@ shift
 BOOTSTRAP_VENV="$1"
 shift
 
+# The basename of the Python executable (found on PATH) that will be used with
+# this image.  This lets us create a virtualenv that uses the correct Python.
+PYTHON="$1"
+shift
+
 # Set up the virtualenv as a non-root user so we can run the test suite as a
 # non-root user.  See below.
-virtualenv --python python2.7 "${BOOTSTRAP_VENV}"
+virtualenv --python "${PYTHON}" "${BOOTSTRAP_VENV}"
 
 # For convenience.
 PIP="${BOOTSTRAP_VENV}/bin/pip"
diff --git a/.circleci/prepare-image.sh b/.circleci/prepare-image.sh
index 271a7004d..842e5bbe2 100755
--- a/.circleci/prepare-image.sh
+++ b/.circleci/prepare-image.sh
@@ -18,6 +18,11 @@ shift
 PROJECT_ROOT="$1"
 shift
 
+# The basename of the Python executable (found on PATH) that will be used with
+# this image.  This lets us create a virtualenv that uses the correct Python.
+PYTHON="$1"
+shift
+
 "${PROJECT_ROOT}"/.circleci/fix-permissions.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PROJECT_ROOT}"
-sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/create-virtualenv.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}"
+sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/create-virtualenv.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PYTHON}"
 sudo --set-home -u nobody "${PROJECT_ROOT}"/.circleci/populate-wheelhouse.sh "${WHEELHOUSE_PATH}" "${BOOTSTRAP_VENV}" "${PROJECT_ROOT}"