Followup fixes

.github/workflows/test_cpp.yml

@@ -310,7 +310,7 @@ jobs:
             os: macos-12
             bazel: //src/...
           - name: Windows
-            os: windows-2022
+            os: windows-2019
             bazel: //src/...  @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance
     name: ${{ matrix.name }} Bazel
     runs-on: ${{ matrix.os }}
@@ -321,14 +321,13 @@ jobs:
           ref: ${{ inputs.safe-checkout }}
       # Workaround for incompatibility between gcloud and windows-2019 runners.
       - name: Install Python
-        if: ${{ matrix.python-version }}
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
+        if: runner.os == 'Windows'
         with:
-          python-version: ${{ matrix.python-version }}
-          cache: pip
+          python-version: '3.8'
       - name: Use custom python for gcloud
-        if: ${{ matrix.python-version }}
         run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV
+        if: runner.os == 'Windows'
         shell: bash
       - name: Run tests
         uses: ./.github/actions/bazel
@@ -397,7 +396,6 @@ jobs:
         uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
         with:
           python-version: ${{ matrix.python-version }}
-          cache: pip
       - name: Use custom python for gcloud
         if: ${{ matrix.python-version }}
         run: echo "CLOUDSDK_PYTHON=${Python3_ROOT_DIR}\\python3" >> $GITHUB_ENV

.github/workflows/test_csharp.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Setup dotnet
         uses: actions/setup-dotnet@607fce577a46308457984d59e4954e075820f10a # v3.0.3
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '3.1.x'
 
       - name: Build
         run: dotnet build csharp/src/Google.Protobuf.sln

.github/workflows/test_python.yml

@@ -17,7 +17,7 @@ jobs:
         version: [ "3.7", "3.8", "3.9", "3.10" ]
         include:
           - type: Pure
-            targets: //python/... @upb//python/... //python:python_version
+            targets: //python/... //python:python_version
             flags: --define=use_fast_cpp_protos=false
           - type: C++
             targets: //python/... //python:python_version
@@ -54,7 +54,7 @@ jobs:
         version: [ "3.10" ]
         include:
           - type: Pure
-            targets: //python/... @upb//python/... //python:python_version
+            targets: //python/... //python:python_version
           - type: C++
             targets: //python/... //python:python_version
             flags: --define=use_fast_cpp_protos=true

python/BUILD.bazel

@@ -8,7 +8,8 @@
 
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_python//python:defs.bzl", "py_library")
-load("@pip_deps//:requirements.bzl", "requirement")
+# It's no longer feasible to test this in our CI, and python is out of it's support window.
+#load("@pip_deps//:requirements.bzl", "requirement")
 load("//:protobuf.bzl", "internal_py_proto_library")
 load("//build_defs:arch_tests.bzl", "aarch64_test", "x86_64_test")
 load("//build_defs:cpp_opts.bzl", "COPTS")
@@ -325,13 +326,13 @@ internal_py_test(
     data = ["//src/google/protobuf:testdata"],
 )
 
-internal_py_test(
-    name = "numpy_test",
-    srcs = ["google/protobuf/internal/numpy_test.py"],
-    deps = [
-        requirement("numpy"),
-    ],
-)
+#internal_py_test(
+#    name = "numpy_test",
+#    srcs = ["google/protobuf/internal/numpy_test.py"],
+#    deps = [
+#        requirement("numpy"),
+#    ],
+#)
 
 internal_py_test(
     name = "proto_builder_test",