Skip to content

Commit c982940

Browse files
committed
update test output
1 parent b18f972 commit c982940

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
--- [TESTROOT]/bundle/templates/default-python/classic/../serverless/output/my_default_python/databricks.yml
22
+++ output/my_default_python/databricks.yml
3-
<<<<<<< HEAD
4-
@@ -25,4 +25,8 @@
5-
host: [DATABRICKS_URL]
6-
7-
+ artifacts:
8-
+ python_artifact:
9-
+ dynamic_version: true
10-
=======
113
@@ -25,4 +25,11 @@
124
host: [DATABRICKS_URL]
135

@@ -17,7 +9,6 @@
179
+ # new wheel takes over the previous installation even if actual wheel version is unchanged.
1810
+ # See https://docs.databricks.com/aws/en/dev-tools/bundles/settings
1911
+ artifacts_dynamic_version: true
20-
>>>>>>> 5aac9f812 (add missing output files)
2112
+
2213
prod:
2314
mode: production
@@ -50,11 +41,7 @@
5041
- # Full documentation of this spec can be found at:
5142
- # https://docs.databricks.com/api/workspace/jobs/create#environments-spec
5243
- spec:
53-
<<<<<<< HEAD
5444
- client: "2"
55-
=======
56-
- client: "1"
57-
>>>>>>> 5aac9f812 (add missing output files)
5845
- dependencies:
5946
- - ../dist/*.whl
6047
+ job_clusters:

0 commit comments

Comments
 (0)