From a73ba19fd88ed2aae30a5d5eb548329b2106746d Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Fri, 7 Oct 2022 16:54:36 -0400 Subject: [PATCH 1/3] fix(deps): allow protobuf 3.19.5 (#839) * fix(deps): allow protobuf 3.19.5 * explicitly exclude protobuf 4.21.0 --- setup.py | 2 +- testing/constraints-3.7.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b14776ee2d..a29a3e44a4 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ "proto-plus >= 1.22.0, <2.0.0dev", "sqlparse >= 0.3.0", "packaging >= 14.3", - "protobuf >= 3.20.2, <5.0.0dev", + "protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5", ] extras = { "tracing": [ diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt index 7391e756d0..5a63b04a4d 100644 --- a/testing/constraints-3.7.txt +++ b/testing/constraints-3.7.txt @@ -15,4 +15,4 @@ opentelemetry-api==1.1.0 opentelemetry-sdk==1.1.0 opentelemetry-instrumentation==0.20b0 packaging==14.3 -protobuf==3.20.2 +protobuf==3.19.5 From 258f486bc5d9c3c31fa72f63e0ea47b9cf42bf86 Mon Sep 17 00:00:00 2001 From: Victor Chudnovsky Date: Mon, 10 Oct 2022 12:14:02 -0700 Subject: [PATCH 2/3] fix: Cherrypick protobuf fix for freeze exception --- CHANGELOG.md | 6 ++++++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e09b232b92..dc15952b91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ [1]: https://pypi.org/project/google-cloud-spanner/#history +## [3.22.2](https://github.com/googleapis/python-spanner/compare/v3.22.1...v3.22.2) (2022-10-07) + +### Bug Fixes + +* **deps:** Allow protobuf 3.19.5 ([#839](https://github.com/googleapis/python-spanner/issues/839)) ([06725fc](https://github.com/googleapis/python-spanner/commit/06725fcf7fb216ad0cffb2cb568f8da38243c32e)) + ## [3.22.1](https://github.com/googleapis/python-spanner/compare/v3.22.0...v3.22.1) (2022-10-04) diff --git a/setup.py b/setup.py index a29a3e44a4..9cc4b48572 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ name = "google-cloud-spanner" description = "Cloud Spanner API client library" -version = "3.22.1" +version = "3.22.2" # Should be one of: # 'Development Status :: 3 - Alpha' # 'Development Status :: 4 - Beta' From 94114798a8f6de03c0d5bf30792d42b1f6fbbff0 Mon Sep 17 00:00:00 2001 From: Victor Chudnovsky Date: Mon, 10 Oct 2022 12:28:03 -0700 Subject: [PATCH 3/3] Fix date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc15952b91..749815260f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ [1]: https://pypi.org/project/google-cloud-spanner/#history -## [3.22.2](https://github.com/googleapis/python-spanner/compare/v3.22.1...v3.22.2) (2022-10-07) +## [3.22.2](https://github.com/googleapis/python-spanner/compare/v3.22.1...v3.22.2) (2022-10-10)  ### Bug Fixes