From c6d1d4f38f345efb8774d92470cb3ea21ccb8cbc Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 18 Jun 2025 12:23:51 +0200 Subject: [PATCH 1/3] Update client version to "2" --- NEXT_CHANGELOG.md | 1 + .../{{.project_name}}/resources/{{.project_name}}.job.yml.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index c6e54dc1fe..515a9a877b 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -9,6 +9,7 @@ ### CLI ### Bundles +* Update client version to "2" for the serverless variation of the default-python template. * Fix reading dashboard contents when the sync root is different than the bundle root ([#3006](https://github.com/databricks/cli/pull/3006)) * When glob for wheels is used, like "\*.whl", it will filter out different version of the same package and will only take the most recent version. ([#2982](https://github.com/databricks/cli/pull/2982)) * When building Python artifacts as part of "bundle deploy" we no longer delete `dist`, `build`, `*egg-info` and `__pycache__` directories. ([#2982](https://github.com/databricks/cli/pull/2982)) 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 9dea88dede..3d8d7e318a 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 @@ -74,7 +74,7 @@ resources: # Full documentation of this spec can be found at: # https://docs.databricks.com/api/workspace/jobs/create#environments-spec spec: - client: "1" + client: "2" dependencies: - ../dist/*.whl {{end}}{{ else }} From 786b28a285111bc2ae87335625c4da18f03696ed Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 18 Jun 2025 12:31:16 +0200 Subject: [PATCH 2/3] Update acceptance tests --- .../default-python/classic/out.compare-vs-serverless.diff | 2 +- .../my_default_python/resources/my_default_python.job.yml | 2 +- 2 files changed, 2 insertions(+), 2 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 d05edefc70..51dd3a6aa4 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 @@ -27,7 +27,7 @@ - # Full documentation of this spec can be found at: - # https://docs.databricks.com/api/workspace/jobs/create#environments-spec - spec: -- client: "1" +- client: "2" - dependencies: - - ../dist/*.whl + job_clusters: 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 0fc9b58ec3..df74a62185 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 @@ -40,6 +40,6 @@ resources: # Full documentation of this spec can be found at: # https://docs.databricks.com/api/workspace/jobs/create#environments-spec spec: - client: "1" + client: "2" dependencies: - ../dist/*.whl From 876044924cf5914232eddcd0b76db6c73db50e02 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 18 Jun 2025 13:18:56 +0200 Subject: [PATCH 3/3] Add PR link --- NEXT_CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md index 515a9a877b..bc14e564d2 100644 --- a/NEXT_CHANGELOG.md +++ b/NEXT_CHANGELOG.md @@ -9,7 +9,7 @@ ### CLI ### Bundles -* Update client version to "2" for the serverless variation of the default-python template. +* Update client version to "2" for the serverless variation of the default-python template ([#3083](https://github.com/databricks/cli/pull/3083)) * Fix reading dashboard contents when the sync root is different than the bundle root ([#3006](https://github.com/databricks/cli/pull/3006)) * When glob for wheels is used, like "\*.whl", it will filter out different version of the same package and will only take the most recent version. ([#2982](https://github.com/databricks/cli/pull/2982)) * When building Python artifacts as part of "bundle deploy" we no longer delete `dist`, `build`, `*egg-info` and `__pycache__` directories. ([#2982](https://github.com/databricks/cli/pull/2982))