Skip to content

CherryPicked: [v4.19]ci(deps): lock file maintenance (v4.20)#2720

Merged
rnetser merged 2 commits into
v4.19from
CherryPicked-CherryPicked-renovate/main-lock-file-maintenance-M7EB5-6RyTF
May 14, 2026
Merged

CherryPicked: [v4.19]ci(deps): lock file maintenance (v4.20)#2720
rnetser merged 2 commits into
v4.19from
CherryPicked-CherryPicked-renovate/main-lock-file-maintenance-M7EB5-6RyTF

Conversation

@rnetser
Copy link
Copy Markdown
Collaborator

@rnetser rnetser commented May 14, 2026

Cherry-pick from v4.20 branch, original PR: #2715, PR owner: manage-repositories-app[bot]

* ci(deps): lock file maintenance (main) (#2702)

* ci(deps): lock file maintenance

* Update Python compatibility markers and modernize code

Update resolution markers to support Python 3.12 as primary version with 3.11 as fallback. Modernize Python 3.10+ syntax by replacing typing constructs with built-in generics (Optional → None union, List → list, Tuple → tuple). Update imports to use traceback at module level and refactor error handling from assert to raise AssertionError. Simplify failure summary output by removing truncation logic. Replace uv.lock with updated dependencies reflecting Python version changes.

* chore: update pre-commit dependencies

Update ruff to v0.15.12, gitleaks to v8.30.1, and mypy to v1.20.2. Also remove unnecessary space in string join operation in test fixture.

* Fix CLI tool invocations with missing configuration flags

Update pytest, prek, and ruff commands to include their required
configuration flags. Add `--group tests` to pytest invocation, add
`-c .pre-commit-config.yaml` to prek invocation, and add
`--config pyproject.toml` to ruff invocation. Also remove extra space
in string join operation for consistency.

* test: Update pytest invocation with test dependency group

The pytest command in the CLI test now includes the `--group tests` flag
to ensure the test dependencies are available when running pytest through
the uv package manager.

* Refactor imports in class_generator_template.j2

Reorganize imports to improve readability and add conditional import for MissingRequiredArgumentError. The exception import is now only included when there are required arguments that will actually use it, reducing unnecessary dependencies in generated classes with no required arguments.

* Remove extra blank line in class_generator_template.j2

* Improve file formatting with prek and ruff fallback

Add ruff as a fallback formatter when prek fails. Extract project root
path calculation to module level and pass configuration paths explicitly
to prek. Introduce _run_ruff_fallback() helper that runs ruff check and
ruff format sequentially. Update logging to clarify fallback behavior
and fix typo in prek stdout log message.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Meni Yakove <myakove@gmail.com>

* fix: revert ruff to v0.14.2, fix mock tests, regenerate manifests

- Revert ruff from v0.15.12 to v0.14.2 in pre-commit config to avoid
  90+ new lint errors from stricter rules on maintenance branch
- Fix TestCheckAndUpdateClusterVersion mock tests by adding
  _get_open_mode() helper to handle missing positional mode argument
- Regenerate 18 test manifest files to match current generator output

Assisted-by: Claude <noreply@anthropic.com>

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Meni Yakove <myakove@gmail.com>
Co-authored-by: rnetser <rnetser@redhat.com>

Signed-off-by: manage-repositories-app[bot] <rnetser@redhat.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 14, 2026

Important

Review skipped

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

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: d67acf93-acd6-4c0d-8449-71fe739fa2ce

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:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch CherryPicked-CherryPicked-renovate/main-lock-file-maintenance-M7EB5-6RyTF

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.

@rnetser
Copy link
Copy Markdown
Collaborator Author

rnetser commented May 14, 2026

/retest all

- Re-add OAuth and Pipeline to test_parse_explain test list — they were
  accidentally dropped during cherry-pick conflict resolution
- Regenerate Image, OAuth, and Pipeline manifest files to match current
  generator output

Assisted-by: Claude <noreply@anthropic.com>
Signed-off-by: rnetser <rnetser@redhat.com>
@redhat-qe-bot1 redhat-qe-bot1 requested a review from myakove May 14, 2026 12:31
@redhat-qe-bot1 redhat-qe-bot1 requested a review from dbasunag May 14, 2026 12:31
@rnetser rnetser changed the title CherryPicked: [v4.19] CherryPicked: [v4.20] ci(deps): lock file maintenance (main) CherryPicked: [v4.19]ci(deps): lock file maintenance (v4.20) May 14, 2026
@rnetser
Copy link
Copy Markdown
Collaborator Author

rnetser commented May 14, 2026

/verified
/approve
/lgtm

@rnetser rnetser merged commit f6cae90 into v4.19 May 14, 2026
7 checks passed
@rnetser rnetser deleted the CherryPicked-CherryPicked-renovate/main-lock-file-maintenance-M7EB5-6RyTF branch May 14, 2026 12:37
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.

4 participants