From 84da27542793070c571c9a85adcf4c7730750fdb Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Sat, 6 Apr 2019 09:41:47 -0400
Subject: [PATCH] Get a couple more basic deps in the wheelhouse

---
 .circleci/populate-wheelhouse.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.circleci/populate-wheelhouse.sh b/.circleci/populate-wheelhouse.sh
index 9d90d19bb..009baf7f5 100755
--- a/.circleci/populate-wheelhouse.sh
+++ b/.circleci/populate-wheelhouse.sh
@@ -3,6 +3,10 @@
 # https://vaneyckt.io/posts/safer_bash_scripts_with_set_euxo_pipefail/
 set -euxo pipefail
 
+# Basic Python packages that you just need to have around to do anything,
+# practically speaking.
+BASIC_DEPS="pip wheel"
+
 # Python packages we need to support the test infrastructure.  *Not* packages
 # Tahoe-LAFS itself (implementation or test suite) need.
 TEST_DEPS="tox codecov"
@@ -37,10 +41,13 @@ export PIP_FIND_LINKS="file://${WHEELHOUSE_PATH}"
     wheel \
     --wheel-dir "${WHEELHOUSE_PATH}" \
     "${PROJECT_ROOT}" \
+    ${BASIC_DEPS} \
     ${TEST_DEPS} \
     ${REPORTING_DEPS}
 
-# Not strictly wheelhouse population but ...
+# Not strictly wheelhouse population but ... Note we omit basic deps here.
+# They're in the wheelhouse if Tahoe-LAFS wants to drag them in but it will
+# have to ask.
 "${PIP}" \
     install \
     ${TEST_DEPS} \