From 654832ea1f699d2f59d6f7c9bfbb4361df77399a Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Fri, 14 Feb 2025 17:21:43 +0100 Subject: [PATCH] adjust whitespace --- .../classic/out.compare-vs-serverless.diff | 13 +++++++------ .../resources/my_default_python.job.yml | 1 + .../resources/my_default_python.job.yml | 1 + .../resources/{{.project_name}}.job.yml.tmpl | 6 +++--- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff b/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff index 95ed062e4..6f5b0a7f4 100644 --- a/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff +++ b/acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff @@ -6,7 +6,7 @@ + job_cluster_key: job_cluster notebook_task: notebook_path: ../src/notebook.ipynb -@@ -29,16 +30,19 @@ +@@ -29,17 +30,20 @@ depends_on: - task_key: refresh_pipeline - environment_key: default @@ -14,6 +14,12 @@ python_wheel_task: package_name: my_default_python entry_point: main ++ libraries: ++ # By default we just include the .whl file generated for the my_default_python package. ++ # See https://docs.databricks.com/dev-tools/bundles/library-dependencies.html ++ # for more information on how to add other libraries. ++ - whl: ../dist/*.whl + - # A list of task execution environment specifications that can be referenced by tasks of this job. - environments: - - environment_key: default @@ -24,11 +30,6 @@ - client: "1" - dependencies: - - ../dist/*.whl -+ libraries: -+ # By default we just include the .whl file generated for the my_default_python package. -+ # See https://docs.databricks.com/dev-tools/bundles/library-dependencies.html -+ # for more information on how to add other libraries. -+ - whl: ../dist/*.whl + job_clusters: + - job_cluster_key: job_cluster + new_cluster: diff --git a/acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.job.yml b/acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.job.yml index b8de4d490..d9e31691a 100644 --- a/acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.job.yml +++ b/acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.job.yml @@ -38,6 +38,7 @@ resources: # See https://docs.databricks.com/dev-tools/bundles/library-dependencies.html # for more information on how to add other libraries. - whl: ../dist/*.whl + job_clusters: - job_cluster_key: job_cluster new_cluster: diff --git a/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python.job.yml b/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python.job.yml index 7040eb8a5..cc5aeb71c 100644 --- a/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python.job.yml +++ b/acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python.job.yml @@ -32,6 +32,7 @@ resources: python_wheel_task: package_name: my_default_python entry_point: main + # A list of task execution environment specifications that can be referenced by tasks of this job. environments: - environment_key: default diff --git a/libs/template/templates/default-python/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl index ca8d7296c..ca35debb7 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl +++ b/libs/template/templates/default-python/template/{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl @@ -70,10 +70,10 @@ resources: # See https://docs.databricks.com/dev-tools/bundles/library-dependencies.html # for more information on how to add other libraries. - whl: ../dist/*.whl - {{- end -}} +{{- end -}} {{else}} - {{- end -}} - {{- if $with_serverless}} +{{- end}} +{{if $with_serverless}} # A list of task execution environment specifications that can be referenced by tasks of this job. environments: - environment_key: default