json-merge-patch becomes optional library and has looser restrictions (…

…apache#13175) (cherry picked from commit e35bdb9) (cherry picked from commit ffe1bea)
astronomer · Apr 23, 2021 · ae439a0 · ae439a0
1 parent ae2e2b5
commit ae439a0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/setup.cfg b/setup.cfg
@@ -109,7 +109,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
@@ -312,6 +312,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 = [