From c2064d31e0a371012dabcce28b64a9a5ff88d4f0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 10 Aug 2022 17:09:54 +0000
Subject: [PATCH 1/3] chore(main): release 1.22.0

---
 CHANGELOG.md | 8 ++++++++
 setup.py     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 901e0162..d315e457 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.22.0](https://github.com/googleapis/proto-plus-python/compare/v1.21.0...v1.22.0) (2022-08-10)
+
+
+### Bug Fixes
+
+* Fix Timestamp, Duration and FieldMask marshaling in REST transport ([a2e7300](https://github.com/googleapis/proto-plus-python/commit/a2e7300368625ceec39dd2c2dfb96291ad8cf1f1))
+* fixes bug in the test. ([#332](https://github.com/googleapis/proto-plus-python/issues/332)) ([f85f470](https://github.com/googleapis/proto-plus-python/commit/f85f470c880a7bff7f3c813d33d15e657e7b5123))
+
 ## [1.20.6](https://github.com/googleapis/proto-plus-python/compare/v1.20.5...v1.20.6) (2022-06-13)
 
 
diff --git a/setup.py b/setup.py
index e427e582..cab688e3 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 
 from setuptools import find_packages, setup
 
-version = "1.20.6"
+version = "1.22.0"
 
 PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 

From 58f042830c9546db7d196de1beeedd26ce556984 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 10 Aug 2022 17:11:52 +0000
Subject: [PATCH 2/3] add changelog for PR #327

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d315e457..1e7dec80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [1.22.0](https://github.com/googleapis/proto-plus-python/compare/v1.21.0...v1.22.0) (2022-08-10)
 
+### Features
+
+* Add support for protobuf v4 ([#327](https://github.com/googleapis/proto-plus-python/issues/327)) ([ed353aa](https://github.com/googleapis/proto-plus-python/commit/ed353aaf8bd5a659535eb493221320e449f3f637))
 
 ### Bug Fixes
 

From 101a8c137d627657a9e47c97d54480d45e314615 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 10 Aug 2022 17:12:19 +0000
Subject: [PATCH 3/3] ci: fix docs build

---
 .github/workflows/tests.yml | 2 +-
 noxfile.py                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 88044988..219bb5a3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python 3.8
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.10"
       - name: Install nox.
         run: python -m pip install nox
       - name: Build the documentation.
diff --git a/noxfile.py b/noxfile.py
index 0e65692e..576a616c 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -79,7 +79,7 @@ def unitupb(session):
 def docs(session):
     """Build the docs."""
 
-    session.install("sphinx", "sphinx_rtd_theme")
+    session.install("sphinx==4.2.0", "sphinx_rtd_theme")
     session.install(".")
 
     # Build the docs!