From d8d2da4b406758205a98dea5a646f903e944bc14 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 6 Sep 2022 19:16:46 +0000 Subject: [PATCH 1/4] chore(v1): release 1.33.0 --- CHANGELOG.md | 7 +++++++ google/api_core/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f41c7dd8..480bcb61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ [1]: https://pypi.org/project/google-api-core/#history +## [1.33.0](https://github.com/googleapis/python-api-core/compare/v1.32.0...v1.33.0) (2022-09-06) + + +### Features + +* Merge main branch into v1 ([#438](https://github.com/googleapis/python-api-core/issues/438)) ([a175ce5](https://github.com/googleapis/python-api-core/commit/a175ce55578a6a3e79b6960d8e28d4e7f67ce5ee)) + ## [1.32.0](https://github.com/googleapis/python-api-core/compare/v1.31.6...v1.32.0) (2022-07-13) diff --git a/google/api_core/version.py b/google/api_core/version.py index 687ca554..d4cd2b06 100644 --- a/google/api_core/version.py +++ b/google/api_core/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.32.0" +__version__ = "1.33.0" From cd15de93065cfe95eda9f8ba204e6c06e9882f50 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 6 Sep 2022 19:18:31 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .github/release-please.yml | 6 ++++++ .github/workflows/docs.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 466597e5..6def37a8 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,8 @@ releaseType: python handleGHRelease: true +# NOTE: this section is generated by synthtool.languages.python +# See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py +branches: +- branch: v0 + handleGHRelease: true + releaseType: python diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6dd32fec..7092a139 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,7 +1,7 @@ on: pull_request: branches: - - v1 + - main name: docs jobs: docs: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cabd0e5b..eae860a2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ on: pull_request: branches: - - v1 + - main name: lint jobs: lint: From 724d3718494164875a61de33d69226864ba50d6b Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 7 Sep 2022 11:09:23 -0400 Subject: [PATCH 3/4] revert --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 7092a139..6dd32fec 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,7 +1,7 @@ on: pull_request: branches: - - main + - v1 name: docs jobs: docs: From 39a6b930a90628c24057efc65bf13583cda5fa93 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 7 Sep 2022 11:09:39 -0400 Subject: [PATCH 4/4] revert --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eae860a2..cabd0e5b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ on: pull_request: branches: - - main + - v1 name: lint jobs: lint: