From a7a01206f68429ca50003e871e25e7ee04c50371 Mon Sep 17 00:00:00 2001 From: Gleb Kanterov Date: Fri, 17 Jan 2025 16:59:53 +0100 Subject: [PATCH] Fix uv.lock --- acceptance/acceptance_test.go | 12 ++++++-- .../output/my_jobs_as_code/uv.lock | 28 ------------------- 2 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/uv.lock diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 5afab5d276..5f1181313c 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -395,11 +395,13 @@ func CopyDir(src, dst string, inputs, outputs map[string]bool) error { func ListDir(t *testing.T, src string) ([]string, error) { // exclude folders in .gitignore from comparison - ignoredFolders := []string{ + ignored := []string{ "\\.ruff_cache", "\\.venv", ".*\\.egg-info", "__pycache__", + // depends on uv version + "uv.lock", } var files []string @@ -409,13 +411,19 @@ func ListDir(t *testing.T, src string) ([]string, error) { } if info.IsDir() { - for _, ignoredFolder := range ignoredFolders { + for _, ignoredFolder := range ignored { if matched, _ := regexp.MatchString(ignoredFolder, info.Name()); matched { return filepath.SkipDir } } return nil + } else { + for _, ignoredFolder := range ignored { + if matched, _ := regexp.MatchString(ignoredFolder, info.Name()); matched { + return nil + } + } } relPath, err := filepath.Rel(src, path) diff --git a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/uv.lock b/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/uv.lock deleted file mode 100644 index 14491a34d9..0000000000 --- a/acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/uv.lock +++ /dev/null @@ -1,28 +0,0 @@ -version = 1 -requires-python = ">=3.10" - -[manifest] -overrides = [{ name = "pyspark", marker = "sys_platform == 'never'" }] - -[[package]] -name = "databricks-bundles" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/2e/55/5ccd397771973d23044997ad2555523c107ce1346f5d16f4bffd4ab5a23d/databricks_bundles-0.7.0-py3-none-any.whl", hash = "sha256:9bc7de987c869380f17a1c8e4a684827105f57c1fb6cd01223818548010a33c4", size = 97620 }, -] - -[[package]] -name = "my-jobs-as-code" -version = "0.0.1" -source = { editable = "." } - -[package.dev-dependencies] -dev = [ - { name = "databricks-bundles" }, -] - -[package.metadata] - -[package.metadata.requires-dev] -dev = [{ name = "databricks-bundles", specifier = "==0.7.0" }]