From d60b25ddb8b084cc74d686481c550b36a445fcd4 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Mon, 31 Oct 2022 10:12:34 -0700
Subject: [PATCH] Update GHA to Python 3 for "testclient.py"

---
 .github/workflows/ci.yml | 2 +-
 .test/test.sh            | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54e431f..f25e558 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,6 @@ jobs:
       - uses: actions/checkout@v3 # clone Notary upstream repo (used for generating necessary certificates to test against)
         with:
           repository: 'notaryproject/notary'
-          ref: '74ee191c214795fb5e839bca841c7be2030d0002'
+          ref: '887a007da8841e49023684656926d79d89d5a9d8'
           path: 'notary-src'
       - run: NOTARY_SOURCE="$GITHUB_WORKSPACE/notary-src" ./.test/test.sh
diff --git a/.test/test.sh b/.test/test.sh
index a155298..aa4656d 100755
--- a/.test/test.sh
+++ b/.test/test.sh
@@ -112,10 +112,9 @@ docker run "${args[@]}" \
 docker run "${args[@]}" \
 	--name notary-testclient \
 	--init \
-	pypy:2.7-bullseye bash -Eeuo pipefail -xc '
+	python:3.10-bullseye bash -Eeuo pipefail -xc '
 		ln -svf ../../fixtures/root-ca.crt cmd/notary/
-		pypy ./buildscripts/testclient.py \
+		python3 ./buildscripts/testclient.py \
 			--reponame registry.local:5000/testclient/testclient \
 			--server "$DOCKER_CONTENT_TRUST_SERVER"
 	'
-# TODO switch to something like "python:3.10-bullseye" once testclient.py actually supports Python 3 🙈