Skip to content

Cherrypick #31550 and #31602 onto release branch#31562

Merged
kennknowles merged 2 commits intoapache:release-2.57.0from
shunping:shunping-cherry-pick-31550
Jun 17, 2024
Merged

Cherrypick #31550 and #31602 onto release branch#31562
kennknowles merged 2 commits intoapache:release-2.57.0from
shunping:shunping-cherry-pick-31550

Conversation

@shunping
Copy link
Copy Markdown
Collaborator

@shunping shunping commented Jun 11, 2024 •
edited
Loading

Cherry-pick #31550 and #31602 onto release branch

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 11, 2024

R: @kennknowles

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jun 11, 2024

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

kennknowles
kennknowles approved these changes Jun 11, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@kennknowles kennknowles left a comment

Choose a reason for hiding this comment

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

will merge when green

@kennknowles
Copy link
Copy Markdown
Member

kennknowles commented Jun 11, 2024

This may be red on the release branch:

apache_beam/internal/gcp/auth.py:82: error: Incompatible return value type (got "Optional[_ApitoolsCredentialsAdapter]", expected "Optional[Credentials]")  [return-value]
apache_beam/internal/gcp/auth_test.py:29: error: Incompatible types in assignment (expression has type "None", variable has type Module)  [assignment]
Found 2 errors in 2 files (checked 1147 source files)

@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 11, 2024

right. I think that has been fixed in master recently but needs to be cherry-picked as well. 47d9bca

@jrmccluskey

@kennknowles
Copy link
Copy Markdown
Member

kennknowles commented Jun 12, 2024

it will make me happy if you will rebase so it can be green for sure (yes, I know it is very obvious and we are confident what the problem was)

@shunping
[Python] Add warning to temp_location and staging_location when the b…
51683bf 
…ucket has soft delete enabled (apache#31550)

* Add warning if soft delete is enabled in temp or staging buckets.
@shunping shunping force-pushed the shunping-cherry-pick-31550 branch from 24553d9 to 51683bf Compare June 12, 2024 13:35
@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 12, 2024

Tests are alll green now.

@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 13, 2024

@kennknowles Could you help to merge this?

@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 14, 2024

@kennknowles:

This PR is causing certain internal test failure. If you have not merged that, please skip it for this release (2.57.0).

@shunping shunping marked this pull request as draft June 14, 2024 04:16
@kennknowles kennknowles marked this pull request as ready for review June 14, 2024 15:54
@kennknowles
Copy link
Copy Markdown
Member

kennknowles commented Jun 14, 2024

I can cp both. There is time. go ahead and open the other one to cherrypick as well

@shunping shunping changed the title Cherrypick #31550 onto release branch Cherrypick #31550 and #31602 onto release branch Jun 14, 2024
@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 14, 2024

I can cp both. There is time. go ahead and open the other one to cherrypick as well

The fix PR depends on the previous change. It may be easier to put both into one.

@shunping
Copy link
Copy Markdown
Collaborator Author

shunping commented Jun 15, 2024

Run Python PreCommit 3.11

@kennknowles kennknowles merged commit df480af into apache:release-2.57.0 Jun 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kennknowles kennknowles kennknowles approved these changes

Assignees

No one assigned

Labels

gcp io python

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@shunping @kennknowles