[airflow] branch master updated: json-merge-patch becomes optional library and has looser restrictions (#13175)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kamilbregula pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/master by this push:
     new e35bdb9  json-merge-patch becomes optional library and has looser restrictions (#13175)
e35bdb9 is described below

commit e35bdb94b27ed884e8093d28ecd09318b4cc0244
Author: Kamil Breguła <mi...@users.noreply.github.com>
AuthorDate: Mon Dec 28 11:42:11 2020 +0100

    json-merge-patch becomes optional library and has looser restrictions (#13175)
---
 setup.cfg | 1 -
 setup.py  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index fc87b92..c6905d1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -107,7 +107,6 @@ install_requires =
     iso8601>=0.1.12
     itsdangerous>=1.1.0
     jinja2>=2.10.1, <2.12.0
-    json-merge-patch==0.2
     jsonschema~=3.0
     lazy-object-proxy<1.5.0  # Required to keep pip-check happy with astroid
     lockfile>=0.12.2
diff --git a/setup.py b/setup.py
index 28ddcd2..6f69454 100644
--- a/setup.py
+++ b/setup.py
@@ -278,6 +278,7 @@ google = [
     'google-cloud-videointelligence>=1.7.0,<2.0.0',
     'google-cloud-vision>=0.35.2,<2.0.0',
     'grpcio-gcp>=0.2.2',
+    'json-merge-patch~=0.2',
     'pandas-gbq',
 ]
 grpc = [