From f5d324e1ba2bc5cdc39af23db13e00a425cb47f4 Mon Sep 17 00:00:00 2001
From: Sarah Gibson <drsarahlgibson@gmail.com>
Date: Wed, 22 Nov 2023 14:38:19 +0000
Subject: [PATCH 1/2] Simplify repo2docker workflow

- only run on pushes to main
- always push
---
 .github/workflows/build-images.yaml | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index d598b01..0009dff 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -8,11 +8,6 @@ on:
       - main
     paths:
       - "images/**"
-  pull_request:
-    branches:
-      - main
-    paths:
-      - "images/**"
 
 # When multiple PRs triggering this workflow are merged, queue them instead
 # of running them in parallel in case of clashes when pushing
@@ -64,8 +59,6 @@ jobs:
       matrix:
         jobs: ${{ fromJson(needs.generate-build-matrix.outputs.images-to-build) }}
     steps:
-      - run: echo "${{ github.event_name == 'pull_request' }}"
-
       # For biggish images, github actions runs out of disk space.
       # So we cleanup some unwanted things in the disk image, and reclaim that space for our docker use
       # https://github.com/actions/virtual-environments/issues/2606#issuecomment-772683150
@@ -98,11 +91,7 @@ jobs:
           # Tell repo2docker which subdirectory to examine
           # ref: https://repo2docker.readthedocs.io/en/latest/usage.html#cmdoption-jupyter-repo2docker-subdir
           REPO2DOCKER_EXTRA_ARGS: "--subdir images/${{ matrix.jobs.image-name }}"
-  
-          # If the event that triggered this workflow was a pull request, the image
-          # will be built but not pushed to the registry
-          NO_PUSH: ${{ github.event_name == 'pull_request' }}
-  
+
       # Lets us monitor disks getting full as images get bigger over time
       - name: Show how much disk space is left
         run: df -h

From 0a1b3a2733cb720b4045ea808a872b5763ad1ea3 Mon Sep 17 00:00:00 2001
From: Sarah Gibson <drsarahlgibson@gmail.com>
Date: Wed, 22 Nov 2023 14:45:03 +0000
Subject: [PATCH 2/2] Remove test-image folder

---
 images/test-image/requirements.txt | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 images/test-image/requirements.txt

diff --git a/images/test-image/requirements.txt b/images/test-image/requirements.txt
deleted file mode 100644
index 4021870..0000000
--- a/images/test-image/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-numpy
-pandas
-matplotlib