Skip to content

[rhoai-3.4-ea.2] lockfile refresh with protobuf pinned to keep IBM arch wheels#2053

Merged
jiridanek merged 4 commits intored-hat-data-services:rhoai-3.4-ea.2from
jiridanek:jdanek/rhoai-3.4-ea.2-lockfile-refresh-protobuf-revert
Mar 27, 2026
Merged

[rhoai-3.4-ea.2] lockfile refresh with protobuf pinned to keep IBM arch wheels#2053
jiridanek merged 4 commits intored-hat-data-services:rhoai-3.4-ea.2from
jiridanek:jdanek/rhoai-3.4-ea.2-lockfile-refresh-protobuf-revert

Conversation

@jiridanek
Copy link
Copy Markdown
Member

@jiridanek jiridanek commented Mar 26, 2026

https://redhat.atlassian.net/browse/RHAIENG-3611

Summary

  • Run FORCE_LOCKFILES_UPGRADE=1 gmake refresh-lock-files to update all pylock files (same as [rhoai-3.4-ea.2] run FORCE_LOCKFILES_UPGRADE=1 gmake refresh-lock-files #2052)
  • Revert protobuf 6.33.6→6.33.5 and 7.34.1→7.34.0 because 6.33.6 dropped ppc64le and s390x wheels from the internal PyPI index
  • Without the revert, these images would fail to build on IBM architectures:
    • jupyter-minimal-ubi9-python-3.12 (ppc64le, s390x)
    • jupyter-datascience-ubi9-python-3.12 (ppc64le)
    • runtime-minimal-ubi9-python-3.12 (s390x)
    • runtime-datascience-ubi9-python-3.12 (s390x)
  • All other version bumps (attrs, boto3, botocore, pyjwt, pyarrow, yarl) are kept

Test plan

🤖 Generated with Claude Code

Summary by CodeRabbit

  • Chores
    • Updated Python package dependencies across multiple deployment configurations (CPU, CUDA, ROCm) to latest compatible patch versions, including security and compatibility updates.
    • Removed deprecated dependency and expanded platform-specific package support for multi-architecture deployments.

@openshift-ci openshift-ci Bot requested a review from ayush17 March 26, 2026 17:53
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 26, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jiridanek for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot requested a review from ysok March 26, 2026 17:53
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Mar 26, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

🗂️ Base branches to auto review (2)
  • main
  • 2024b

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 4a84a42c-5715-4321-93ef-30f2daa3c314

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • ✅ Review completed - (🔄 Check again to review again)
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

jiridanek and others added 4 commits March 26, 2026 20:42
…E=1 gmake refresh-lock-files

needed to get fixed build of pyarrow for the No module named 'pyarrow._s3fs' crash
…c64le/s390x wheels

protobuf 6.33.6 dropped ppc64le and s390x wheels from the internal PyPI
index, which would break builds for jupyter-minimal, jupyter-datascience,
runtime-minimal, and runtime-datascience on those architectures.

Revert protobuf 6.33.6→6.33.5 and 7.34.1→7.34.0 to restore the IBM
architecture wheels while keeping all other package upgrades from the
lockfile refresh.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@jiridanek jiridanek force-pushed the jdanek/rhoai-3.4-ea.2-lockfile-refresh-protobuf-revert branch from 33139b2 to 7e8a234 Compare March 26, 2026 19:43
@jiridanek
Copy link
Copy Markdown
Member Author

/build-konflux

Copy link
Copy Markdown

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml (1)

2-2: ⚠️ Potential issue | 🟡 Minor

Use the repository’s lock refresh target for regeneration.

The lock header indicates direct uv pip compile invocation at Line 2. Please regenerate via the repo-standard target to match contributor workflow and avoid drift in future refreshes.

As per coding guidelines: "Use pyproject.toml and pylock.toml for Python dependencies; regenerate lock files after dependency changes by running make refresh-pipfilelock-files".

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml` at line 2, Replace the
direct "uv pip compile ..." header line in pylock.toml with a note that the
lockfile is generated via the repository target; regenerate the lock by running
the standard target "make refresh-pipfilelock-files" instead of invoking the uv
pip compile command directly, and commit the updated pylock.toml so the header
and contents reflect the repo-standard regeneration workflow.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Outside diff comments:
In `@jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml`:
- Line 2: Replace the direct "uv pip compile ..." header line in pylock.toml
with a note that the lockfile is generated via the repository target; regenerate
the lock by running the standard target "make refresh-pipfilelock-files" instead
of invoking the uv pip compile command directly, and commit the updated
pylock.toml so the header and contents reflect the repo-standard regeneration
workflow.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 0056d5f2-e4b6-4383-9f24-6cb0662ac49f

📥 Commits

Reviewing files that changed from the base of the PR and between aa79fa2 and 7e8a234.

📒 Files selected for processing (18)
  • codeserver/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • jupyter/datascience/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • jupyter/minimal/ubi9-python-3.12/uv.lock.d/pylock.rocm.toml
  • jupyter/pytorch+llmcompressor/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • jupyter/pytorch/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • jupyter/rocm/pytorch/ubi9-python-3.12/uv.lock.d/pylock.rocm.toml
  • jupyter/rocm/tensorflow/ubi9-python-3.12/pylock.toml
  • jupyter/tensorflow/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • jupyter/trustyai/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • runtimes/datascience/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • runtimes/minimal/ubi9-python-3.12/uv.lock.d/pylock.cpu.toml
  • runtimes/pytorch+llmcompressor/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • runtimes/pytorch/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml
  • runtimes/rocm-pytorch/ubi9-python-3.12/uv.lock.d/pylock.rocm.toml
  • runtimes/rocm-tensorflow/ubi9-python-3.12/pylock.toml
  • runtimes/tensorflow/ubi9-python-3.12/uv.lock.d/pylock.cuda.toml

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant