From fb0260c790f2fe151c4f7c72d3b9e77970939e11 Mon Sep 17 00:00:00 2001
From: David Hewitt <mail@davidhewitt.dev>
Date: Mon, 12 Feb 2024 23:22:10 +0000
Subject: [PATCH] fix clippy-all noxfile job

---
 noxfile.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 190c6fde9ce..3981e62e100 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -8,9 +8,10 @@
 from functools import lru_cache
 from glob import glob
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple
 
 import nox
+import nox.command
 
 nox.options.sessions = ["test", "clippy", "rustfmt", "ruff", "docs"]
 
@@ -101,7 +102,7 @@ def _clippy(session: nox.Session, *, env: Dict[str, str] = None) -> bool:
                 "--deny=warnings",
                 env=env,
             )
-        except Exception:
+        except nox.command.CommandFailed:
             success = False
     return success
 
@@ -736,7 +737,7 @@ def _for_all_version_configs(
 ) -> None:
     env = os.environ.copy()
     with _config_file() as config_file:
-        env["PYO3_CONFIG_FILE"] = config_file
+        env["PYO3_CONFIG_FILE"] = config_file.name
 
         def _job_with_config(implementation, version):
             session.log(f"{implementation} {version}")
@@ -773,7 +774,7 @@ def name(self) -> str:
 
 
 @contextmanager
-def _config_file() -> _ConfigFile:
+def _config_file() -> Iterator[_ConfigFile]:
     """Creates a temporary config file which can be repeatedly set to different values."""
     with tempfile.NamedTemporaryFile("r+") as config:
         yield _ConfigFile(config)