ob-metaflow 2.12.14.1__tar.gz → 2.12.16.1__tar.gz

{ob_metaflow-2.12.14.1/ob_metaflow.egg-info → ob_metaflow-2.12.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.14.1
+Version: 2.12.16.1
 Summary: Metaflow: More Data Science, Less Engineering
 Author: Netflix, Outerbounds & the Metaflow Community
 Author-email: help@outerbounds.co
@@ -12,7 +12,7 @@ Requires-Dist: boto3
 Requires-Dist: pylint
 Requires-Dist: kubernetes
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.12.14.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.16.1; extra == "stubs"
 
 ![Metaflow_Logo_Horizontal_FullColor_Ribbon_Dark_RGB](https://user-images.githubusercontent.com/763451/89453116-96a57e00-d713-11ea-9fa6-82b29d4d6eff.png)
 

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1}/metaflow/metaflow_environment.py

@@ -94,9 +94,11 @@ class MetaflowEnvironment(object):
             bucket, s3_object = parse_s3_full_path(code_package_url)
             # NOTE: the script quoting is extremely sensitive due to the way shlex.split operates and this being inserted
             # into a quoted command elsewhere.
+            # NOTE: Reason for the extra conditionals in the script are because
+            # Boto3 does not play well with passing None or an empty string to endpoint_url
             return "{python} -c '{script}'".format(
                 python=self._python(),
-                script='import boto3, os; boto3.client(\\"s3\\", endpoint_url=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\")).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
+                script='import boto3, os; ep=os.getenv(\\"METAFLOW_S3_ENDPOINT_URL\\"); boto3.client(\\"s3\\", **({endpoint_url=ep} if ep else {})}).download_file(\\"%s\\", \\"%s\\", \\"job.tar\\")'
                 % (bucket, s3_object),
             )
         elif datastore_type == "azure":

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1}/metaflow/plugins/argo/argo_workflows_cli.py

@@ -36,6 +36,12 @@ from .argo_workflows import ArgoWorkflows
 
 VALID_NAME = re.compile(r"^[a-z0-9]([a-z0-9\.\-]*[a-z0-9])?$")
 
+unsupported_decorators = {
+    "snowpark": "Step *%s* is marked for execution on Snowpark with Argo Workflows which isn't currently supported.",
+    "slurm": "Step *%s* is marked for execution on Slurm with Argo Workflows which isn't currently supported.",
+    "nvidia": "Step *%s* is marked for execution on Nvidia with Argo Workflows which isn't currently supported.",
+}
+
 
 class IncorrectProductionToken(MetaflowException):
     headline = "Incorrect production token"
@@ -211,6 +217,11 @@ def create(
     deployer_attribute_file=None,
     enable_error_msg_capture=False,
 ):
+    for node in obj.graph:
+        for decorator, error_message in unsupported_decorators.items():
+            if any([d.name == decorator for d in node.decorators]):
+                raise MetaflowException(error_message % node.name)
+
     validate_tags(tags)
 
     if deployer_attribute_file:

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1}/metaflow/plugins/pypi/conda_decorator.py

@@ -210,7 +210,7 @@ class CondaStepDecorator(StepDecorator):
         self.interpreter = (
             self.environment.interpreter(self.step)
             if not any(
-                decorator.name in ["batch", "kubernetes"]
+                decorator.name in ["batch", "kubernetes", "nvidia", "snowpark", "slurm"]
                 for decorator in next(
                     step for step in self.flow if step.name == self.step
                 ).decorators

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1}/metaflow/plugins/pypi/conda_environment.py

@@ -268,7 +268,7 @@ class CondaEnvironment(MetaflowEnvironment):
         for decorator in step.decorators:
             # TODO: rather than relying on decorator names, rely on attributes
             #       to make them extensible.
-            if decorator.name in ["batch", "kubernetes", "nvidia"]:
+            if decorator.name in ["batch", "kubernetes", "nvidia", "snowpark", "slurm"]:
                 # TODO: Support arm architectures
                 target_platform = "linux-64"
                 break

ob_metaflow-2.12.16.1/metaflow/version.py

@@ -0,0 +1 @@
+metaflow_version = "2.12.16.1"

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1/ob_metaflow.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ob-metaflow
-Version: 2.12.14.1
+Version: 2.12.16.1
 Summary: Metaflow: More Data Science, Less Engineering
 Author: Netflix, Outerbounds & the Metaflow Community
 Author-email: help@outerbounds.co
@@ -12,7 +12,7 @@ Requires-Dist: boto3
 Requires-Dist: pylint
 Requires-Dist: kubernetes
 Provides-Extra: stubs
-Requires-Dist: metaflow-stubs==2.12.14.1; extra == "stubs"
+Requires-Dist: metaflow-stubs==2.12.16.1; extra == "stubs"
 
 ![Metaflow_Logo_Horizontal_FullColor_Ribbon_Dark_RGB](https://user-images.githubusercontent.com/763451/89453116-96a57e00-d713-11ea-9fa6-82b29d4d6eff.png)
 

{ob_metaflow-2.12.14.1 → ob_metaflow-2.12.16.1}/ob_metaflow.egg-info/requires.txt

@@ -4,4 +4,4 @@ pylint
 kubernetes
 
 [stubs]
-metaflow-stubs==2.12.14.1
+metaflow-stubs==2.12.16.1

ob_metaflow-2.12.14.1/metaflow/version.py

@@ -1 +0,0 @@
-metaflow_version = "2.12.14.1"