Merge branch 'main' into main

Author: sshpuntoff

.github/CODEOWNERS

@@ -4,3 +4,7 @@
 /acceptance/pipelines/    @jefferycheng1 @kanterov @lennartkats-db
 /cmd/pipelines/           @jefferycheng1 @kanterov @lennartkats-db
 /cmd/labs/                @alexott @nfx
+/experimental/aitools/    @databricks/eng-app-devex @lennartkats-db
+/cmd/workspace/apps/      @databricks/eng-app-devex
+/libs/apps/               @databricks/eng-app-devex
+/acceptance/apps/         @databricks/eng-app-devex

Makefile

@@ -1,7 +1,7 @@
 default: checks fmt lint
 
 # gotestsum: when go test args are used with --rerun-fails the list of packages to test must be specified by the --packages flag
-PACKAGES=--packages "./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/ssh/... ."
+PACKAGES=--packages "./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/aitools/... ./experimental/ssh/... ."
 
 GO_TOOL ?= go tool -modfile=tools/go.mod
 GOTESTSUM_FORMAT ?= pkgname-and-test-fails

NEXT_CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Bundles
 * Add validation that served_models and served_entities are not used at the same time. Add client side translation logic. ([#3880](https://github.com/databricks/cli/pull/3880))
 * Allow `file://` URIs in job libraries to reference runtime filesystem paths (e.g., JARs pre-installed on clusters via init scripts). These paths are no longer treated as local files to upload. ([#3884](https://github.com/databricks/cli/pull/3884))
+* Update templates to use serverless environment version 4 and matching Python version ([#3897](https://github.com/databricks/cli/pull/3897))
 * Add a language prompt to the `default-minimal` template ([#3918](https://github.com/databricks/cli/pull/3918))
 * Add `default-scala` template for Scala projects with SBT build configuration and example code ([#3906](https://github.com/databricks/cli/pull/3906))
 

acceptance/bundle/resources/model_serving_endpoints/running-endpoint/test.toml

@@ -17,5 +17,5 @@ Response.Body = '''
 '''
 
 [[Repls]]
-Old = '"entity_version": "1",'
+Old = '"entity_version": "\d+",'
 New = '"entity_version": "[VERSION]",'

acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/resources/my_dbt_sql.job.yml

@@ -29,6 +29,6 @@ resources:
       environments:
         - environment_key: default
           spec:
-            environment_version: "2"
+            environment_version: "4"
             dependencies:
               - dbt-databricks>=1.8.0,<2.0.0

acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff

@@ -51,7 +51,7 @@
 -      environments:
 -        - environment_key: default
 -          spec:
--            environment_version: "2"
+-            environment_version: "4"
 -            dependencies:
 -              # 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

acceptance/bundle/templates/default-python/classic/output/my_default_python/pyproject.toml

@@ -2,7 +2,7 @@
 name = "my_default_python"
 version = "0.0.1"
 authors = [{ name = "[USERNAME]" }]
-requires-python = ">=3.10,<=3.13"
+requires-python = ">=3.10,<3.13"
 dependencies = [
     # Any dependencies for jobs and pipelines in this project can be added here
     # See also https://docs.databricks.com/dev-tools/bundles/library-dependencies

acceptance/bundle/templates/default-python/classic/output/my_default_python/src/sample_notebook.ipynb

@@ -72,7 +72,7 @@
     "dependencies": [
      "--editable .."
     ],
-    "environment_version": "2"
+    "environment_version": "4"
    },
    "language": "python",
    "notebookMetadata": {
@@ -141,7 +141,7 @@
   },
   "language_info": {
    "name": "python",
-   "version": "3.11.4"
+   "version": "3.12"
   }
  },
  "nbformat": 4,

acceptance/bundle/templates/default-python/serverless/output/my_default_python/pyproject.toml

@@ -2,7 +2,7 @@
 name = "my_default_python"
 version = "0.0.1"
 authors = [{ name = "[USERNAME]" }]
-requires-python = ">=3.10,<=3.13"
+requires-python = ">=3.10,<3.13"
 dependencies = [
     # Any dependencies for jobs and pipelines in this project can be added here
     # See also https://docs.databricks.com/dev-tools/bundles/library-dependencies

acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/sample_job.job.yml

@@ -46,7 +46,7 @@ resources:
       environments:
         - environment_key: default
           spec:
-            environment_version: "2"
+            environment_version: "4"
             dependencies:
               # 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