more tweaks

Zac-HD · Zac-HD · commit bff38debe373 · 2025-12-22T16:51:35.000-08:00
diff --git a/hypothesis-python/src/hypothesis/strategies/_internal/datetime.py b/hypothesis-python/src/hypothesis/strategies/_internal/datetime.py
@@ -424,7 +424,7 @@ def timezone_keys(
     with warnings.catch_warnings():
         try:
             warnings.simplefilter("ignore", EncodingWarning)
-        except NameError:
+        except NameError:  # pragma: no cover
             pass
         # On Python 3.12 (and others?), `available_timezones()` opens files
         # without specifying an encoding - which our selftests make an error.
diff --git a/tooling/src/hypothesistooling/__main__.py b/tooling/src/hypothesistooling/__main__.py
@@ -606,7 +606,12 @@ def run_tox(task, version, *args):
 
     env["PATH"] = os.path.dirname(python) + ":" + env["PATH"]
     # Set environment variable for tox to use in basepython substitution
-    env["TOX_PYTHON_VERSION"] = ALIASES[version]
+    if version.startswith("pypy"):
+        # For PyPy, use the version name from e.g. "pypy3.11-7.3.20"
+        # to match tox's environment name inference.
+        env["TOX_PYTHON_VERSION"] = version.split("-")[0]  # "pypy3.11"
+    else:
+        env["TOX_PYTHON_VERSION"] = ALIASES[version]  # "python3.12"
     print(env["PATH"])
 
     pip_tool("tox", "-e", task, *args, env=env, cwd=hp.HYPOTHESIS_PYTHON)
