From 1274d026ac6d7e756f1e04a74afc7c84fadccfe2 Mon Sep 17 00:00:00 2001 From: Gleb Kanterov Date: Thu, 10 Apr 2025 15:36:50 +0200 Subject: [PATCH 1/2] [Python] Update version to 0.247.1 --- experimental/python/databricks/bundles/version.py | 1 + experimental/python/pyproject.toml | 2 +- experimental/python/uv.lock | 2 +- .../templates/experimental-jobs-as-code/library/versions.tmpl | 2 ++ .../template/{{.project_name}}/pyproject.toml.tmpl | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 experimental/python/databricks/bundles/version.py diff --git a/experimental/python/databricks/bundles/version.py b/experimental/python/databricks/bundles/version.py new file mode 100644 index 0000000000..db6e11c066 --- /dev/null +++ b/experimental/python/databricks/bundles/version.py @@ -0,0 +1 @@ +__version__ = "0.247.1" diff --git a/experimental/python/pyproject.toml b/experimental/python/pyproject.toml index 827f34cfe9..ec12ff6138 100644 --- a/experimental/python/pyproject.toml +++ b/experimental/python/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "databricks-bundles" description = "Python support for Databricks Asset Bundles" -version = "0.243.0-dev" +version = "0.247.1" authors = [ { name = "Gleb Kanterov", email = "gleb.kanterov@databricks.com" }, diff --git a/experimental/python/uv.lock b/experimental/python/uv.lock index b236ebd1d6..193fe03d82 100644 --- a/experimental/python/uv.lock +++ b/experimental/python/uv.lock @@ -166,7 +166,7 @@ toml = [ [[package]] name = "databricks-bundles" -version = "0.243.0.dev0" +version = "0.247.1" source = { editable = "." } [package.dev-dependencies] diff --git a/libs/template/templates/experimental-jobs-as-code/library/versions.tmpl b/libs/template/templates/experimental-jobs-as-code/library/versions.tmpl index 7d0c88e7df..cdde71b7a5 100644 --- a/libs/template/templates/experimental-jobs-as-code/library/versions.tmpl +++ b/libs/template/templates/experimental-jobs-as-code/library/versions.tmpl @@ -5,3 +5,5 @@ {{define "latest_lts_db_connect_version_spec" -}} >=15.4,<15.5 {{- end}} + +{{define "latest_databricks_bundles_version" -}}0.247.1{{- end}} diff --git a/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/pyproject.toml.tmpl b/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/pyproject.toml.tmpl index 6b41bf9980..4cb0e6d9ee 100644 --- a/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/pyproject.toml.tmpl +++ b/libs/template/templates/experimental-jobs-as-code/template/{{.project_name}}/pyproject.toml.tmpl @@ -39,7 +39,7 @@ py-modules = [] [tool.uv] ## Dependencies for local development dev-dependencies = [ - "databricks-bundles==0.7.2", + "databricks-bundles=={{template "latest_databricks_bundles_version"}}", ## Add code completion support for DLT # "databricks-dlt", From ba27bea6d4e80ec2cbfec8460f9dde8f15ac5f1d Mon Sep 17 00:00:00 2001 From: Gleb Kanterov Date: Thu, 10 Apr 2025 16:15:05 +0200 Subject: [PATCH 2/2] Fix tests --- .../output/my_jobs_as_code/pyproject.toml | 2 +- .../bundle/templates/experimental-jobs-as-code/script | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/pyproject.toml b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/pyproject.toml index 68b85ee9c6..643ab6b963 100644 --- a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/pyproject.toml +++ b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/pyproject.toml @@ -29,7 +29,7 @@ where = ["src"] [tool.uv] ## Dependencies for local development dev-dependencies = [ - "databricks-bundles==0.7.2", + "databricks-bundles==x.y.z", ## Add code completion support for DLT # "databricks-dlt", diff --git a/acceptance/bundle/templates/experimental-jobs-as-code/script b/acceptance/bundle/templates/experimental-jobs-as-code/script index 4b31247f50..10eeb43717 100644 --- a/acceptance/bundle/templates/experimental-jobs-as-code/script +++ b/acceptance/bundle/templates/experimental-jobs-as-code/script @@ -3,7 +3,10 @@ trace $CLI bundle init experimental-jobs-as-code --config-file ./input.json --ou cd output/my_jobs_as_code # silence uv output because it's non-deterministic -uv sync -q +# +# with -f we add pre-build wheel, in addition to PyPi index, +# if PyPi package is not yet published, it will be used instead +uv -q sync -f $(dirname $DATABRICKS_BUNDLES_WHEEL) trace $CLI bundle validate -t dev --output json | jq ".resources" @@ -14,7 +17,10 @@ rm -fr .venv resources/__pycache__ uv.lock src/my_jobs_as_code.egg-info dist # remove requires-python because it doesn't pass ruff checks after we replace # requires-python=">=3.10" with requires-python=">=[UV_PYTHON]" -cat pyproject.toml | grep -v requires-python > pyproject.toml.new +# replace databricks-bundles version with x.y.z for deterministic output +cat pyproject.toml | \ + grep -v requires-python | \ + sed -E 's/databricks-bundles==[0-9]+\.[0-9]+\.[0-9]+/databricks-bundles==x.y.z/g' > pyproject.toml.new mv pyproject.toml.new pyproject.toml # Do not affect this repository's git behaviour #2318