Merge branch 'main' into do_not_init_logging_on_import

continuous_integration/scripts/host_info.py

@@ -30,11 +30,16 @@ def main() -> None:
     bench()
     print(f"Crude CPU benchmark (higher is better): {bench():.1f}")
 
-    freqs = psutil.cpu_freq(percpu=True)
-    print("CPU frequency:")
-    for freq in freqs:
-        # FIXME types-psutil
-        print(f"  - current={freq.current}, min={freq.min}, max={freq.max}")  # type: ignore
+    try:
+        freqs = psutil.cpu_freq(percpu=True)
+    # https://github.com/giampaolo/psutil/issues/2382
+    except RuntimeError:
+        print("CPU frequency: not available")
+    else:
+        print("CPU frequency:")
+        for freq in freqs:
+            # FIXME types-psutil
+            print(f"  - current={freq.current}, min={freq.min}, max={freq.max}")  # type: ignore
 
     mem = psutil.virtual_memory()
     print("Memory:")

distributed/metrics.py

@@ -2,6 +2,7 @@
 
 import asyncio
 import collections
+import sys
 import threading
 import time as timemod
 from collections.abc import Callable, Hashable, Iterator
@@ -93,7 +94,7 @@ def resync(self) -> None:
 
 
 # A high-resolution wall clock timer measuring the seconds since Unix epoch
-if WINDOWS:
+if WINDOWS and sys.version_info < (3, 13):
     time = _WindowsTime(timemod.time, is_monotonic=False).time
     monotonic = _WindowsTime(timemod.monotonic, is_monotonic=True).time
 else: