Expand and upload local wheel libraries for all task types

bundle/artifacts/whl/autodetect.go

@@ -27,9 +27,9 @@ func (m *detectPkg) Name() string {
 }
 
 func (m *detectPkg) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
-	wheelTasks := libraries.FindAllWheelTasksWithLocalLibraries(b)
-	if len(wheelTasks) == 0 {
-		log.Infof(ctx, "No local wheel tasks in databricks.yml config, skipping auto detect")
+	tasks := libraries.FindTasksWithLocalLibraries(b)
+	if len(tasks) == 0 {
+		log.Infof(ctx, "No local tasks in databricks.yml config, skipping auto detect")
 		return nil
 	}
 	log.Infof(ctx, "Detecting Python wheel project...")

bundle/artifacts/whl/from_libraries.go

@@ -27,7 +27,7 @@ func (*fromLibraries) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnost
 		return nil
 	}
 
-	tasks := libraries.FindAllWheelTasksWithLocalLibraries(b)
+	tasks := libraries.FindTasksWithLocalLibraries(b)
 	for _, task := range tasks {
 		for _, lib := range task.Libraries {
 			matchAndAdd(ctx, lib.Whl, b)

bundle/libraries/libraries.go

@@ -44,18 +44,14 @@ func isEnvsWithLocalLibraries(envs []jobs.JobEnvironment) bool {
 	return false
 }
 
-func FindAllWheelTasksWithLocalLibraries(b *bundle.Bundle) []*jobs.Task {
+func FindTasksWithLocalLibraries(b *bundle.Bundle) []*jobs.Task {
 	tasks := findAllTasks(b)
 	envs := FindAllEnvironments(b)
 
 	wheelTasks := make([]*jobs.Task, 0)
 	for k, jobTasks := range tasks {
 		for i := range jobTasks {
 			task := &jobTasks[i]
-			if task.PythonWheelTask == nil {
-				continue
-			}
-
 			if isTaskWithLocalLibraries(*task) {
 				wheelTasks = append(wheelTasks, task)
 			}

bundle/python/warning.go

@@ -35,7 +35,7 @@ func isPythonWheelWrapperOn(b *bundle.Bundle) bool {
 }
 
 func hasIncompatibleWheelTasks(ctx context.Context, b *bundle.Bundle) bool {
-	tasks := libraries.FindAllWheelTasksWithLocalLibraries(b)
+	tasks := libraries.FindTasksWithLocalLibraries(b)
 	for _, task := range tasks {
 		if task.NewCluster != nil {
 			if lowerThanExpectedVersion(ctx, task.NewCluster.SparkVersion) {

bundle/tests/python_wheel/python_wheel_no_artifact/bundle.yml

@@ -8,8 +8,7 @@ resources:
       tasks:
         - task_key: TestTask
           existing_cluster_id: "0717-aaaaa-bbbbbb"
-          python_wheel_task:
-            package_name: "my_test_code"
-            entry_point: "run"
+          notebook_task:
+            notebook_path: "/notebook.py"
           libraries:
           - whl: ./dist/*.whl

bundle/tests/python_wheel/python_wheel_no_artifact/notebook.py

@@ -0,0 +1,3 @@
+# Databricks notebook source
+
+print("Hello, World!")