From 9c7b2f89bd5d82edd191de09638d813c1943a7da Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 24 May 2021 11:51:35 -0400
Subject: [PATCH 1/2] Version 2.2.0

---
 CHANGELOG.md |  8 +++++++-
 README.md    | 10 +++++-----
 setup.py     |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a533ca4e..f0a04b82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.0] - 2021-05-24
+### Added
+- Relax constraint to `flask<3.0` and `click<9.0` ([#129])
+
 ## [2.1.3] - 2021-04-23
 ### Changed
 - Change gunicorn loglevel to error ([#122])
@@ -101,7 +105,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/GoogleCloudPlatform/functions-framework-python/compare/v2.1.3...HEAD
+[Unreleased]: https://github.com/GoogleCloudPlatform/functions-framework-python/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v2.2.0
 [2.1.3]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v2.1.3
 [2.1.2]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v2.1.2
 [2.1.1]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v2.1.1
@@ -121,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.0.1]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.1
 [1.0.0]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.0
 
+[#129]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/129
 [#122]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/122
 [#116]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/116
 [#114]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/114
diff --git a/README.md b/README.md
index 711c1f53..8ed1151b 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ pip install functions-framework
 Or, for deployment, add the Functions Framework to your `requirements.txt` file:
 
 ```
-functions-framework==2.1.3
+functions-framework==2.2.0
 ```
 
 ## Quickstarts
@@ -168,8 +168,8 @@ response instead.
    git clone https://github.com/googleapis/python-pubsub.git
    cd python-pubsub/samples/snippets/
    pip install -r requirements.txt
-    
-   python publisher.py $PUBSUB_PROJECT_ID create $TOPIC_ID   
+
+   python publisher.py $PUBSUB_PROJECT_ID create $TOPIC_ID
    python subscriber.py $PUBSUB_PROJECT_ID create-push $TOPIC_ID $PUSH_SUBSCRIPTION_ID http://localhost:8085
    python publisher.py $PUBSUB_PROJECT_ID publish $TOPIC_ID
    ```
@@ -178,7 +178,7 @@ response instead.
 
    ```none
    Created topic: projects/my-project/topics/my-topic
-   
+
    topic: "projects/my-project/topics/my-topic"
    push_config {
      push_endpoint: "http://localhost:8085"
@@ -189,7 +189,7 @@ response instead.
    }
    .
    Endpoint for subscription is: http://localhost:8085
-    
+
    1
    2
    3
diff --git a/setup.py b/setup.py
index 6564bfec..b2f933b9 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name="functions-framework",
-    version="2.1.3",
+    version="2.2.0",
     description="An open source FaaS (Function as a service) framework for writing portable Python functions -- brought to you by the Google Cloud Functions team.",
     long_description=long_description,
     long_description_content_type="text/markdown",

From 5a3c4bb6b24069e66a9dbca2cf1d44bc9d5469c8 Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Mon, 24 May 2021 11:59:20 -0400
Subject: [PATCH 2/2] Pin back version of docker-py used in tests

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index b9ba72f9..92483e7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = py{35,36,37,38,39}-{ubuntu-latest,macos-latest,windows-latest},lint
 [testenv]
 usedevelop = true
 deps =
-    docker
+    docker<5 # https://github.com/docker/docker-py/issues/2807
     pytest-cov
     pytest-integration
     pretend