Closed dependabot[bot] closed 5 months ago
@dependabot rebase @dependabot squash and merge
One of your CI runs failed on this pull request, so Dependabot won't merge it.
Dependabot will still automatically merge this pull request if you amend it and your tests pass.
#14 3.264 ERROR: Cannot install -r requirements.txt (line 13) and protobuf==5.26.1 because these package versions have conflicting dependencies.
#14 3.265
#14 3.265 The conflict is caused by:
#14 3.265 The user requested protobuf==5.26.1
#14 3.265 google-api-core 2.10.2 depends on protobuf!=3.20.0, !=3.20.1, !=4.21.0, !=4.21.1, !=4.21.2, !=4.21.3, !=4.21.4, !=4.21.5, <5.0.0dev and >=3.19.5
Superseded by #367.
Bumps protobuf from 4.25.3 to 5.26.1.
Commits
2434ef2
Updating version.json and repo version numbers to: 26.149253b1
Merge pull request #16308 from protocolbuffers/cp-26x-39bf69ec
Fix validateFeatures to be called after resolved features are actually set to...b752bc2
Merge pull request #16307 from protocolbuffers/cp-26x-2f7d2326
Merge pull request #16309 from protocolbuffers/cp-26x-42e51ff6
Cherry-pick required label handling in JRuby field descriptor from https://gi...a2f5303
Update cmake stalenes6a177d2
Merge branch '26.x' into cp-26x-42d3d8ba
Expand cpp_features_proto_srcs visibilitye1092ee
Merge pull request #16294 from protocolbuffers/cp-26xYou can trigger a rebase of this PR by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show