From 1430079277acc08659e2dca8bc33338a26c264d6 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 30 Nov 2022 18:05:40 -0500
Subject: [PATCH] [temp] try building good docker images again

---
 .circleci/config.yml             | 106 +++++++++++++++----------------
 .circleci/populate-wheelhouse.sh |   2 +-
 2 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d288f680d..59ae56366 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,69 +14,69 @@ version: 2.1
 workflows:
   ci:
     jobs:
-      # Start with jobs testing various platforms.
-      - "debian-10":
-          {}
-      - "debian-11":
-          {}
+  #     # Start with jobs testing various platforms.
+  #     - "debian-10":
+  #         {}
+  #     - "debian-11":
+  #         {}
 
-      - "ubuntu-20-04":
-          {}
-      - "ubuntu-18-04":
-          requires:
-            - "ubuntu-20-04"
+  #     - "ubuntu-20-04":
+  #         {}
+  #     - "ubuntu-18-04":
+  #         requires:
+  #           - "ubuntu-20-04"
 
-      # Equivalent to RHEL 8; CentOS 8 is dead.
-      - "oraclelinux-8":
-          {}
+  #     # Equivalent to RHEL 8; CentOS 8 is dead.
+  #     - "oraclelinux-8":
+  #         {}
 
-      - "nixos":
-          name: "NixOS 21.05"
-          nixpkgs: "21.05"
+  #     - "nixos":
+  #         name: "NixOS 21.05"
+  #         nixpkgs: "21.05"
 
-      - "nixos":
-          name: "NixOS 21.11"
-          nixpkgs: "21.11"
+  #     - "nixos":
+  #         name: "NixOS 21.11"
+  #         nixpkgs: "21.11"
 
-      # Eventually, test against PyPy 3.8
-      #- "pypy27-buster":
-      #    {}
+  #     # Eventually, test against PyPy 3.8
+  #     #- "pypy27-buster":
+  #     #    {}
 
-      # Other assorted tasks and configurations
-      - "codechecks":
-          {}
-      - "pyinstaller":
-          {}
-      - "c-locale":
-          {}
-      # Any locale other than C or UTF-8.
-      - "another-locale":
-          {}
+  #     # Other assorted tasks and configurations
+  #     - "codechecks":
+  #         {}
+  #     - "pyinstaller":
+  #         {}
+  #     - "c-locale":
+  #         {}
+  #     # Any locale other than C or UTF-8.
+  #     - "another-locale":
+  #         {}
 
-      - "integration":
-          requires:
-            # If the unit test suite doesn't pass, don't bother running the
-            # integration tests.
-            - "debian-11"
+  #     - "integration":
+  #         requires:
+  #           # If the unit test suite doesn't pass, don't bother running the
+  #           # integration tests.
+  #           - "debian-11"
 
-      - "typechecks":
-          {}
-      - "docs":
-          {}
+  #     - "typechecks":
+  #         {}
+  #     - "docs":
+  #         {}
 
-  images:
-    # Build the Docker images used by the ci jobs.  This makes the ci jobs
-    # faster and takes various spurious failures out of the critical path.
-    triggers:
-      # Build once a day
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - "master"
+  # images:
+  #   # Build the Docker images used by the ci jobs.  This makes the ci jobs
+  #   # faster and takes various spurious failures out of the critical path.
+  #   triggers:
+  #     # Build once a day
+  #     - schedule:
+  #         cron: "0 0 * * *"
+  #         filters:
+  #           branches:
+  #             only:
+  #               - "master"
 
-    jobs:
+  #   jobs:
       # Every job that pushes a Docker image from Docker Hub needs to provide
       # credentials.  Use this first job to define a yaml anchor that can be
       # used to supply a CircleCI job context which makes Docker Hub
diff --git a/.circleci/populate-wheelhouse.sh b/.circleci/populate-wheelhouse.sh
index 519a80cac..52ea80a7d 100755
--- a/.circleci/populate-wheelhouse.sh
+++ b/.circleci/populate-wheelhouse.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 
 # Basic Python packages that you just need to have around to do anything,
 # practically speaking.
-BASIC_DEPS="pip wheel"
+BASIC_DEPS="pip wheel setuptools setuptools_scm"
 
 # Python packages we need to support the test infrastructure.  *Not* packages
 # Tahoe-LAFS itself (implementation or test suite) need.