From 3266f5d59d16379756ec522cebad089232779d91 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Mon, 20 Mar 2023 14:03:54 -0400
Subject: [PATCH] Remove the old Debian-based PyPy CircleCI configuration

---
 .circleci/Dockerfile.pypy | 23 -----------------------
 .circleci/config.yml      | 31 -------------------------------
 2 files changed, 54 deletions(-)
 delete mode 100644 .circleci/Dockerfile.pypy

diff --git a/.circleci/Dockerfile.pypy b/.circleci/Dockerfile.pypy
deleted file mode 100644
index 471611ecc..000000000
--- a/.circleci/Dockerfile.pypy
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM pypy:2.7-buster
-
-ENV WHEELHOUSE_PATH /tmp/wheelhouse
-ENV VIRTUALENV_PATH /tmp/venv
-# This will get updated by the CircleCI checkout step.
-ENV BUILD_SRC_ROOT /tmp/project
-
-RUN apt-get --quiet update && \
-    apt-get --quiet --yes install \
-        git \
-        lsb-release \
-        sudo \
-        build-essential \
-        libffi-dev \
-        libssl-dev \
-        libyaml-dev \
-        virtualenv
-
-# Get the project source.  This is better than it seems.  CircleCI will
-# *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}" "pypy"
diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb9bcf33c..7271280e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,9 +44,6 @@ dockerhub-auth-template: &DOCKERHUB_AUTH
         <<: *DOCKERHUB_CONTEXT
     - "build-image-oraclelinux-8":
         <<: *DOCKERHUB_CONTEXT
-    # Restore later as PyPy38
-    #- "build-image-pypy27-buster":
-    #    <<: *DOCKERHUB_CONTEXT
 
 parameters:
   # Control whether the image-building workflow runs as part of this pipeline.
@@ -122,10 +119,6 @@ workflows:
           forceFoolscap: true
           runSlow: false
 
-      # Eventually, test against PyPy 3.8
-      #- "pypy27-buster":
-      #    {}
-
       # Other assorted tasks and configurations
       - "codechecks":
           {}
@@ -286,20 +279,6 @@ jobs:
         user: "nobody"
 
 
-  # Restore later using PyPy3.8
-  # pypy27-buster:
-  #   <<: *DEBIAN
-  #   docker:
-  #     - <<: *DOCKERHUB_AUTH
-  #       image: "tahoelafsci/pypy:buster-py2"
-  #       user: "nobody"
-  #   environment:
-  #     <<: *UTF_8_ENVIRONMENT
-  #     # We don't do coverage since it makes PyPy far too slow:
-  #     TAHOE_LAFS_TOX_ENVIRONMENT: "pypy27"
-  #     # Since we didn't collect it, don't upload it.
-  #     UPLOAD_COVERAGE: ""
-
   c-locale:
     <<: *DEBIAN
 
@@ -583,16 +562,6 @@ jobs:
       TAG: "35"
       PYTHON_VERSION: "3"
 
-  # build-image-pypy27-buster:
-  #   <<: *BUILD_IMAGE
-  #   environment:
-  #     DISTRO: "pypy"
-  #     TAG: "buster"
-  #     # We only have Python 2 for PyPy right now so there's no support for
-  #     # setting up PyPy 3 in the image building toolchain.  This value is just
-  #     # for constructing the right Docker image tag.
-  #     PYTHON_VERSION: "2"
-
 executors:
   nix:
     docker: