Merge remote-tracking branch 'upstream/master' into thomasjpfan/wandb…

…_follow-up

Signed-off-by: Thomas J. Fan <[email protected]>

.github/workflows/pythonbuild.yml

@@ -417,7 +417,8 @@ jobs:
           cd plugins/${{ matrix.plugin-names }}
           uv pip install --system .
           if [ -f dev-requirements.in ]; then uv pip install --system -r dev-requirements.in; fi
-          uv pip install --system -U $GITHUB_WORKSPACE
+          # TODO: move to protobuf>=5. Github issue: https://github.com/flyteorg/flyte/issues/5448
+          uv pip install --system -U $GITHUB_WORKSPACE "protobuf<5"
           uv pip freeze
       - name: Test with coverage
         run: |

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.2.2
+    rev: v0.4.7
     hooks:
       # Run the linter.
       - id: ruff

Dockerfile

@@ -23,9 +23,7 @@ ARG DOCKER_IMAGE
 RUN apt-get update && apt-get install build-essential -y \
     && pip install uv \
     && uv pip install --system --no-cache-dir -U flytekit==$VERSION \
-        flytekitplugins-pod==$VERSION \
         flytekitplugins-deck-standard==$VERSION \
-        scikit-learn \
     && apt-get clean autoclean \
     && apt-get autoremove --yes \
     && rm -rf /var/lib/{apt,dpkg,cache,log}/ \

dev-requirements.in

@@ -37,7 +37,12 @@ torch; python_version<'3.12'
 # Once a solution is found, this should be updated to support Windows as well.
 python-magic; (platform_system=='Darwin' or platform_system=='Linux')
 
-types-protobuf
+# Google released a new major version of the protobuf library and once that started being used in the ecosystem at large,
+# including `googleapis-common-protos` we started seeing errors in CI, so let's constrain that for now.
+# The issue to support protobuf 5 is being tracked in https://github.com/flyteorg/flyte/issues/5448.
+protobuf<5
+types-protobuf<5
+
 types-croniter
 types-decorator
 types-mock