26 jobs does seem large, but they are quite fast. Two suggestions (not sure if they will work):

• add exclude clauses so that we trim the number of jobs down a bit

• or maybe keep the original matrix and add this (not sure if this works, but maybe worth a try?):

     matrix:
        os: [ubuntu-latest, macos-latest]
        test_dir: []
        test_script: []
        include:
          - test_dir: python-setup/tests/pipenv/requests-2
            test_script: $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh 2
          - test_dir: python-setup/tests/pipenv/requests-3
            test_script: $GITHUB_WORKSPACE/python-setup/tests/check_requests_123.sh 3
          ...etc...

The includes in the original matrix weren't working because they didn't mention os, so they weren't getting added to any existing configurations. I think this looks reasonable, will do a more careful review shortly.

I've moved the uses of the matrix vars to environment variables for safety like you suggested. Seems to be working.

Seems to be working.

Knew I shouldn't have posted that. I forgot the windows version runs with powershell. Hopefully that's got it now.

PowerShell env vars get me every time!
This looks good, I think I need to adjust the branch protection rules I added last week since the Windows check names have changed.

I think I need to adjust the branch protection rules I added last week since the Windows check names have changed.

Ugh, that's annoying.

So it's changed from test-setup-python-scripts-windows (python-setup/tests/pipenv/requests-2, 2) to test-setup-python-scripts-windows (pipenv, 2).

So if the rules were updated that would allow this to pass but would then cause problems for all other open PRs. Probably we'll need to just update the rules and merge this PR immediately and deal with any fallout. Or temporarily remove the branch protection rules for these checks are reintroduce them after a period.

I've removed those checks from the required list for now, and will reenable them once we merge this PR. At that point all open PRs will need to update from main anyway, so there shouldn't be much fallout from enabling the new checks.