clean up from merge, remove function recipe replaced by new merged code_recipe

Author: kgued

dataikuapi/dss/dataset.py

@@ -485,16 +485,6 @@ def new_code_recipe(self, type, code=None, recipe_name=None):
             builder.with_script(code)
         return builder
 
-    def new_function_recipe(self, type, recipe_name=None):
-        """Starts creation of a new function code recipe taking this dataset as input"""
-
-        if recipe_name is None:
-            recipe_name = "%s_recipe_from_%s" % (type, self.dataset_name)
-        builder = recipe.FunctionCodeRecipeCreator(recipe_name, type, self.project)
-        builder.with_input(self.dataset_name)
-
-        return builder
-
     def new_grouping_recipe(self, first_group_by, recipe_name=None):
         if recipe_name is None:
             recipe_name = "group_%s" % (self.dataset_name)

dataikuapi/dss/recipe.py

@@ -1115,7 +1115,6 @@ def with_function(self, fn, function_args=None, custom_template=None):
         module_name = inspect.getmodule(fn).__name__
         fname = fn.__name__
         return self.with_function_name(module_name, fname, function_args, custom_template)
->>>>>>> origin/feature/new-dataset-management-apis
 
 class SQLQueryRecipeCreator(SingleOutputRecipeCreator):
     """