Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: merge recent changes from master #823

Merged
merged 5 commits into from
Jul 28, 2021
Merged

chore: merge recent changes from master #823

merged 5 commits into from
Jul 28, 2021

Conversation

plamut
Copy link
Contributor

@plamut plamut commented Jul 28, 2021 •
edited
Loading

(no issue)

Supersedes #822.

PR checklist:

  • Make sure to open an issue as a bug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
  • Ensure the tests and linter pass
  • Code coverage does not decrease (if any source code was changed)
  • Appropriate docs were updated (if necessary)

tswast and others added 5 commits July 27, 2021 13:04
@tswast
chore: protect v3.x.x branch (googleapis#816)
3b70891 
* chore: protect v3.x.x branch

In preparation for breaking changes.

* force pattern to be a string

* simplify branch name
@plamut
fix: no longer raise a warning in to_dataframe if max_results set (…
3c1be14 
…googleapis#815)

That warning should only be used when BQ Storage client is
explicitly passed in to RowIterator methods when max_results
value is also set.
@gcf-owl-bot
feat: Update proto definitions for bigquery/v2 to support new proto f…
fe7a902 
…ields for BQML. (googleapis#817)

PiperOrigin-RevId: 387137741

Source-Link: googleapis/googleapis@8962c92

Source-Link: https://github.com/googleapis/googleapis-gen/commit/102f1b4277cc5a049663535d9eeb77831b67de25
@release-please
chore: release 2.23.0 (googleapis#819)
02bbdae 
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
@plamut
Merge changes from master into v3
24f4bcb
@plamut plamut requested review from tseaver, tswast and a team July 28, 2021 07:56
@plamut plamut requested a review from a team as a code owner July 28, 2021 07:56
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Jul 28, 2021
@product-auto-label product-auto-label bot added the api: bigquery Issues related to the googleapis/python-bigquery API. label Jul 28, 2021
@plamut plamut changed the title Merge recent changes from master chore: merge recent changes from master Jul 28, 2021
@plamut plamut mentioned this pull request Jul 28, 2021
Closed
4 tasks
@tswast tswast merged commit 9319eb1 into googleapis:v3 Jul 28, 2021
@plamut plamut deleted the updates-from-master branch July 28, 2021 16:23
@tseaver
Copy link
Contributor

tseaver commented Jul 29, 2021

FWIW, merging release PRs from master into v3 is going to be problematic going forward: once any release is made from v3 (even a pre-release), the conflict in google/cloud/bigquery/version.py is going to be a constant pain. We may have to resort to cherrypicking, rather than a full merge, if the two branches stay active long enough.

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

@tswast tswast tswast approved these changes

@tseaver tseaver Awaiting requested review from tseaver

Assignees
No one assigned
Labels
api: bigquery Issues related to the googleapis/python-bigquery API. cla: yes This human has signed the Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@plamut @tseaver @tswast