From f667fdd9c2e9ac3ea33404e7c9a410fd0af3ce4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Bregu=C5=82a?= Date: Sat, 19 Dec 2020 03:06:37 +0100 Subject: [PATCH] json-merge-patch becomes optional libraary and has looser restrictiions --- setup.cfg | 1 - setup.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 1fa5af6b34b3b..d861f2fd82a5a 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 98bb628954004..0f5b6cd7de561 100644 --- a/setup.py +++ b/setup.py @@ -278,6 +278,7 @@ def write_version(filename: str = os.path.join(*[my_dir, "airflow", "git_version '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 = [