From a5dda263d4f3f2610695f5aa5577d4c430f44888 Mon Sep 17 00:00:00 2001 From: Sakari Ikonen Date: Tue, 10 Dec 2024 15:21:04 +0200 Subject: [PATCH] cleanup --- metaflow/plugins/pypi/conda_decorator.py | 3 ++- metaflow/plugins/pypi/pypi_decorator.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/metaflow/plugins/pypi/conda_decorator.py b/metaflow/plugins/pypi/conda_decorator.py index 0f7208cd76..b1b7ee833d 100644 --- a/metaflow/plugins/pypi/conda_decorator.py +++ b/metaflow/plugins/pypi/conda_decorator.py @@ -89,9 +89,10 @@ def step_init(self, flow, graph, step, decos, environment, flow_datastore, logge **super_attributes["packages"], **self.attributes["packages"], } - self._attributes_with_user_values = self._attributes_with_user_values.union( + self._attributes_with_user_values.update( conda_base._attributes_with_user_values ) + self.attributes["python"] = ( self.attributes["python"] or super_attributes["python"] ) diff --git a/metaflow/plugins/pypi/pypi_decorator.py b/metaflow/plugins/pypi/pypi_decorator.py index 6942246864..bcc7dda891 100644 --- a/metaflow/plugins/pypi/pypi_decorator.py +++ b/metaflow/plugins/pypi/pypi_decorator.py @@ -43,7 +43,7 @@ def step_init(self, flow, graph, step, decos, environment, flow_datastore, logge if "pypi_base" in self.flow._flow_decorators: pypi_base = self.flow._flow_decorators["pypi_base"][0] super_attributes = pypi_base.attributes - self._attributes_with_user_values = self._attributes_with_user_values.union( + self._attributes_with_user_values.update( pypi_base._attributes_with_user_values ) self.attributes["packages"] = {