Merge remote-tracking branch 'refs/remotes/origin/keep_sorted_columns…

…' into keep_sorted_columns

.github/workflows/python-nightly.yml

@@ -31,22 +31,26 @@ concurrency:
 
 jobs:
   tests:
-    name: "${{ matrix.python-version }}"
-    # Choose a recent Ubuntu that deadsnakes still builds all the versions for.
-    # For example, deadsnakes doesn't provide 3.10 nightly for 22.04 (jammy)
-    # because jammy ships 3.10, and deadsnakes doesn't want to clobber it.
-    # https://launchpad.net/~deadsnakes/+archive/ubuntu/nightly/+packages
-    # https://github.com/deadsnakes/issues/issues/234
-    # See https://github.com/deadsnakes/nightly for the source of the nightly
-    # builds.
-    # bionic: 18, focal: 20, jammy: 22, noble: 24
-    runs-on: ubuntu-22.04
+    name: "${{ matrix.python-version }} on ${{ matrix.os-short }}"
+    runs-on: "${{ matrix.os }}"
     # If it doesn't finish in an hour, it's not going to. Don't spin for six
     # hours needlessly.
     timeout-minutes: 60
 
     strategy:
       matrix:
+        os:
+          # Choose a recent Ubuntu that deadsnakes still builds all the versions for.
+          # For example, deadsnakes doesn't provide 3.10 nightly for 22.04 (jammy)
+          # because jammy ships 3.10, and deadsnakes doesn't want to clobber it.
+          # https://launchpad.net/~deadsnakes/+archive/ubuntu/nightly/+packages
+          # https://github.com/deadsnakes/issues/issues/234
+          # See https://github.com/deadsnakes/nightly for the source of the nightly
+          # builds.
+          # bionic: 18, focal: 20, jammy: 22, noble: 24
+          - "ubuntu-22.04"
+        os-short:
+          - "ubuntu"
         python-version:
           # When changing this list, be sure to check the [gh] list in
           # tox.ini so that tox will run properly. PYVERSIONS
@@ -58,6 +62,10 @@ jobs:
           - "pypy-3.8-nightly"
           - "pypy-3.9-nightly"
           - "pypy-3.10-nightly"
+        include:
+            - python-version: "pypy-3.10-nightly"
+              os: "windows-latest"
+              os-short: "windows"
       fail-fast: false
 
     steps:

.github/workflows/testsuite.yml

@@ -57,20 +57,18 @@ jobs:
         exclude:
           # Windows pypy 3.9 and 3.10 get stuck with PyPy 7.3.15.  I hope to
           # unstick them, but I don't want that to block all other progress, so
-          # skip them for now.
+          # skip them for now. These excludes can be removed once GitHub uses
+          # PyPy 7.3.16 on Windows.  https://github.com/pypy/pypy/issues/4876
           - os: windows
             python-version: "pypy-3.9"
           - os: windows
             python-version: "pypy-3.10"
-        # GitHub is rolling out macos 14, but it doesn't have Python 3.8 or 3.9.
-        # https://mastodon.social/@hugovk/112320493602782374
-        include:
-          - python-version: "3.8"
-            os: "macos"
-            os-version: "13"
-          - python-version: "3.9"
-            os: "macos"
-            os-version: "13"
+        # If we need to tweak the os version we can do it with an include like
+        # this:
+        #  include:
+        #    - python-version: "3.8"
+        #      os: "macos"
+        #      os-version: "13"
 
       fail-fast: false
 

coverage/files.py

@@ -87,8 +87,6 @@ def canonical_filename(filename: str) -> str:
     return CANONICAL_FILENAME_CACHE[filename]
 
 
-MAX_FLAT = 100
-
 def flat_rootname(filename: str) -> str:
     """A base for a flat file name to correspond to this file.
 

metacov.ini

@@ -73,6 +73,9 @@ exclude_lines =
     # longer tested.
     pragma: obscure
 
+    # Lines that will never be called, but satisfy the type checker
+    pragma: never called
+
 partial_branches =
     pragma: part covered
     # A for-loop that always hits its break statement

tests/test_plugins.py

@@ -33,7 +33,7 @@
 class NullConfig(TPluginConfig):
     """A plugin configure thing when we don't really need one."""
     def get_plugin_options(self, plugin: str) -> TConfigSectionOut:
-        return {}
+        return {}   # pragma: never called
 
 
 class FakeConfig(TPluginConfig):
@@ -284,7 +284,8 @@ def test_exception_if_plugins_on_pytracer(self) -> None:
 
         if testenv.PY_TRACER:
             core = "PyTracer"
-        elif testenv.SYS_MON:
+        else:
+            assert testenv.SYS_MON
             core = "SysMonitor"
 
         expected_warnings = [