Merge branch 'master' into airflow

Netflix · Apr 20, 2022 · d299b13 · d299b13
2 parents f2cb319 + 7921d13
commit d299b13
Show file tree

Hide file tree

Showing 46 changed files with 5,324 additions and 128 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,8 +6,9 @@ repos:
       - id: check-yaml
       - id: check-json
   - repo: https://github.com/ambv/black
-    rev: 21.9b0
+    rev: 21.12b0
     hooks:
       - id: black
         language_version: python3
-        exclude: "^metaflow/_vendor/"
+        exclude: "^metaflow/_vendor/"
+        additional_dependencies: ["click<8.1.0"]
diff --git a/metaflow/_vendor/v3_5/__init__.py b/metaflow/_vendor/v3_5/__init__.py
@@ -0,0 +1 @@
+# Empty file
diff --git a/metaflow/_vendor/importlib_metadata.LICENSE → ...w/_vendor/v3_5/importlib_metadata.LICENSE b/metaflow/_vendor/importlib_metadata.LICENSE → ...w/_vendor/v3_5/importlib_metadata.LICENSE
diff --git a/...ow/_vendor/importlib_metadata/__init__.py → ...endor/v3_5/importlib_metadata/__init__.py b/...ow/_vendor/importlib_metadata/__init__.py → ...endor/v3_5/importlib_metadata/__init__.py
@@ -6,7 +6,7 @@
 import abc
 import csv
 import sys
-from metaflow._vendor import zipp
+from metaflow._vendor.v3_5 import zipp
 import operator
 import functools
 import itertools

diff --git a/...low/_vendor/importlib_metadata/_compat.py → ...vendor/v3_5/importlib_metadata/_compat.py b/...low/_vendor/importlib_metadata/_compat.py → ...vendor/v3_5/importlib_metadata/_compat.py
diff --git a/metaflow/_vendor/zipp.LICENSE → metaflow/_vendor/v3_5/zipp.LICENSE b/metaflow/_vendor/zipp.LICENSE → metaflow/_vendor/v3_5/zipp.LICENSE
diff --git a/metaflow/_vendor/zipp.py → metaflow/_vendor/v3_5/zipp.py b/metaflow/_vendor/zipp.py → metaflow/_vendor/v3_5/zipp.py
diff --git a/metaflow/_vendor/v3_6/__init__.py b/metaflow/_vendor/v3_6/__init__.py
@@ -0,0 +1 @@
+# Empty file
diff --git a/metaflow/_vendor/v3_6/importlib_metadata.LICENSE b/metaflow/_vendor/v3_6/importlib_metadata.LICENSE
@@ -0,0 +1,13 @@
+Copyright 2017-2019 Jason R. Coombs, Barry Warsaw
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.