From 44d8383ff44ad6b1803665bd203dd58b1bd83137 Mon Sep 17 00:00:00 2001 From: Arpit Jasapara Date: Mon, 9 Dec 2024 19:30:35 -0800 Subject: [PATCH 1/3] Add bundle UUID and other metadata --- README.md | 2 +- databricks_template_schema.json | 2 +- library/template_variables.tmpl | 2 +- .../databricks.yml.tmpl | 4 ++++ tests/install.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 88a2f218..fd222a63 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ https://github.com/databricks/mlops-stacks/assets/87999496/0d220d55-465e-4a69-bd ### Prerequisites - Python 3.8+ - - [Databricks CLI](https://docs.databricks.com/en/dev-tools/cli/databricks-cli.html) >= v0.221.0 + - [Databricks CLI](https://docs.databricks.com/en/dev-tools/cli/databricks-cli.html) >= v0.236.0 [Databricks CLI](https://docs.databricks.com/en/dev-tools/cli/databricks-cli.html) contains [Databricks asset bundle templates](https://docs.databricks.com/en/dev-tools/bundles/templates.html) for the purpose of project creation. diff --git a/databricks_template_schema.json b/databricks_template_schema.json index d313b3f8..69fc4797 100644 --- a/databricks_template_schema.json +++ b/databricks_template_schema.json @@ -1,6 +1,6 @@ { "welcome_message": "Welcome to MLOps Stacks. For detailed information on project generation, see the README at https://github.com/databricks/mlops-stacks/blob/main/README.md.", - "min_databricks_cli_version": "v0.221.0", + "min_databricks_cli_version": "v0.236.0", "properties": { "input_setup_cicd_and_project": { "order": 1, diff --git a/library/template_variables.tmpl b/library/template_variables.tmpl index e3ed80eb..805f267d 100644 --- a/library/template_variables.tmpl +++ b/library/template_variables.tmpl @@ -56,7 +56,7 @@ {{- end }} {{ define `cli_version` -}} - v0.221.0 + v0.236.0 {{- end }} {{ define `stacks_version` -}} diff --git a/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl b/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl index 2d24d66b..2810edf5 100644 --- a/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl +++ b/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl @@ -1,5 +1,9 @@ # The name of the bundle. run `databricks bundle schema` to see the full bundle settings schema. bundle: + # Do not modify the below two lines, these autogenerated fields are used by the Databricks backend. + uuid: {{ bundle_uuid }} + template: mlops-stacks + name: {{ .input_project_name }} variables: diff --git a/tests/install.sh b/tests/install.sh index 8d0f4b8a..c91e5088 100755 --- a/tests/install.sh +++ b/tests/install.sh @@ -4,7 +4,7 @@ # Usage in the wild uses the "curl | sh" approach and we need that to continue working. set -e -VERSION="0.221.0" +VERSION="0.236.0" FILE="databricks_cli_$VERSION" # Include operating system in file name. From 40e5bdc41080fabb6253e3dd1bfcda34b85e193f Mon Sep 17 00:00:00 2001 From: Arpit Jasapara Date: Wed, 1 Jan 2025 16:45:57 -0800 Subject: [PATCH 2/3] remove template field --- .../databricks.yml.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl b/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl index 2810edf5..aa2955aa 100644 --- a/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl +++ b/template/{{.input_root_dir}}/{{template `project_name_alphanumeric_underscore` .}}/databricks.yml.tmpl @@ -1,8 +1,7 @@ # The name of the bundle. run `databricks bundle schema` to see the full bundle settings schema. bundle: - # Do not modify the below two lines, these autogenerated fields are used by the Databricks backend. + # Do not modify the below line, this autogenerated field is used by the Databricks backend. uuid: {{ bundle_uuid }} - template: mlops-stacks name: {{ .input_project_name }} From e0a64fce9fbd9ad401565cc1297e1f788cbfae29 Mon Sep 17 00:00:00 2001 From: Arpit Jasapara Date: Wed, 1 Jan 2025 17:06:03 -0800 Subject: [PATCH 3/3] remove recipes tests by default --- tests/test_github_actions.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_github_actions.py b/tests/test_github_actions.py index 1b17a8c0..151f95e8 100644 --- a/tests/test_github_actions.py +++ b/tests/test_github_actions.py @@ -53,7 +53,6 @@ def test_generated_yaml_format( [ ("CICD_and_Project", "no", "no", "no"), ("CICD_and_Project", "no", "no", "yes"), - ("CICD_and_Project", "no", "yes", "no"), ("CICD_and_Project", "yes", "no", "no"), ("CICD_and_Project", "yes", "no", "yes"), ],