From 961e7e466cdf6b9af85baa6cdc9be02fd77f5752 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 30 Nov 2023 14:20:09 +0100 Subject: [PATCH 1/5] Change default_python template to auto-update version on each wheel build --- .../default-python/template/{{.project_name}}/setup.py.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl index 4eb6b8f913..4a0f7c9ad7 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl +++ b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl @@ -10,11 +10,12 @@ from setuptools import setup, find_packages import sys sys.path.append('./src') +import datetime import {{.project_name}} setup( name="{{.project_name}}", - version={{.project_name}}.__version__, + version=datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S"), url="https://databricks.com", author="{{user_name}}", description="wheel file based on {{.project_name}}/src", From b6740e0f44416dc7a51de5346842070eea35d806 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 30 Nov 2023 14:21:43 +0100 Subject: [PATCH 2/5] Removed version from __init__.py --- .../{{.project_name}}/src/{{.project_name}}/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py b/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py index f102a9cadf..8b13789179 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py +++ b/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py @@ -1 +1 @@ -__version__ = "0.0.1" + From dceea2047dc00480a64b9033d43e98c8d8e72b9e Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 30 Nov 2023 19:46:43 +0100 Subject: [PATCH 3/5] use build version --- .../default-python/template/{{.project_name}}/setup.py.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl index 4a0f7c9ad7..c594c3d534 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl +++ b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl @@ -15,7 +15,7 @@ import {{.project_name}} setup( name="{{.project_name}}", - version=datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S"), + version={{.project_name}}.__version__ + "+" + datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S"), url="https://databricks.com", author="{{user_name}}", description="wheel file based on {{.project_name}}/src", From 89f2692d0d7de310f99cf6a493db30cb6c6d6b07 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Thu, 30 Nov 2023 19:47:15 +0100 Subject: [PATCH 4/5] Bring back version --- .../{{.project_name}}/src/{{.project_name}}/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py b/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py index 8b13789179..f102a9cadf 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py +++ b/libs/template/templates/default-python/template/{{.project_name}}/src/{{.project_name}}/__init__.py @@ -1 +1 @@ - +__version__ = "0.0.1" From 16738aa985174d22ed9ab53dd2098d57331038e6 Mon Sep 17 00:00:00 2001 From: Andrew Nester Date: Fri, 1 Dec 2023 13:21:58 +0100 Subject: [PATCH 5/5] Added comment --- .../default-python/template/{{.project_name}}/setup.py.tmpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl index c594c3d534..a0852c7252 100644 --- a/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl +++ b/libs/template/templates/default-python/template/{{.project_name}}/setup.py.tmpl @@ -15,6 +15,8 @@ import {{.project_name}} setup( name="{{.project_name}}", + # We use timestamp as Local version identifier (https://peps.python.org/pep-0440/#local-version-identifiers.) + # to ensure that changes to wheel package are picked up when used on all-purpose clusters version={{.project_name}}.__version__ + "+" + datetime.datetime.utcnow().strftime("%Y%m%d.%H%M%S"), url="https://databricks.com", author="{{user_name}}",