From 31a9d0b0c7aa0d80260a41e216fca95d672d5f09 Mon Sep 17 00:00:00 2001
From: David Hewitt <mail@davidhewitt.dev>
Date: Fri, 9 Aug 2024 15:20:50 +0100
Subject: [PATCH 1/3] ci: pin `zope.interface<7`

---
 pytests/noxfile.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pytests/noxfile.py b/pytests/noxfile.py
index af2eb0d3a75..f5a332c7a3c 100644
--- a/pytests/noxfile.py
+++ b/pytests/noxfile.py
@@ -12,12 +12,15 @@ def test(session: nox.Session):
 
     def try_install_binary(package: str, constraint: str):
         try:
-            session.install(f"--only-binary={package}", f"{package}{constraint}")
+            session.install("--only-binary=:all:", f"{package}{constraint}")
         except CommandFailed:
             # No binary wheel available on this platform
             pass
 
     try_install_binary("numpy", ">=1.16")
+    # https://github.com/zopefoundation/zope.interface/issues/316
+    # - is a dependency of gevent
+    try_install_binary("zope.interface", "<7")
     try_install_binary("gevent", ">=22.10.2")
     ignored_paths = []
     if sys.version_info < (3, 10):

From 96265adf2674dc19b5e31626a0e184db083edfb1 Mon Sep 17 00:00:00 2001
From: David Hewitt <mail@davidhewitt.dev>
Date: Fri, 9 Aug 2024 16:42:50 +0100
Subject: [PATCH 2/3] ci: explicit `cargo careful` setup

---
 noxfile.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/noxfile.py b/noxfile.py
index 0267531cb7d..7f012ce2fc5 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -869,6 +869,8 @@ def _run_cargo_test(
 ) -> None:
     command = ["cargo"]
     if "careful" in session.posargs:
+        # do explicit setup so failures in setup can be seen
+        _run_cargo(session, "careful", "setup")
         command.append("careful")
     command.extend(("test", "--no-fail-fast"))
     if "release" in session.posargs:

From ce9545f0e2a1da453e3b3e5430ae9c0baf850b85 Mon Sep 17 00:00:00 2001
From: David Hewitt <mail@davidhewitt.dev>
Date: Fri, 9 Aug 2024 19:58:18 +0100
Subject: [PATCH 3/3] ci: build `cargo-careful` from source while waiting for
 updated binary

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8f4b5dcc67..a1b2ddbf51b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -349,7 +349,9 @@ jobs:
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rust-src
-      - uses: taiki-e/install-action@cargo-careful
+      # FIXME: workaround https://github.com/RalfJung/cargo-careful/issues/36
+      # - uses: taiki-e/install-action@cargo-careful
+      - run: cargo install cargo-careful
       - run: python -m pip install --upgrade pip && pip install nox
       - run: nox -s test-rust -- careful skip-full
     env: