Skip to content

Add support for wheels when deploying pipelines #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukulmurthy merged 2 commits into from
Jul 31, 2019
Merged

Add support for wheels when deploying pipelines #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617b2ea
add support for wheels
arulajmani Jul 31, 2019
c163a6e
linter
arulajmani Jul 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions databricks_cli/pipelines/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@

BUFFER_SIZE = 1024 * 64
base_pipelines_dir = 'dbfs:/pipelines/code'
supported_lib_types = {'jar', 'whl'}


class PipelinesApi(object):
Expand Down Expand Up @@ -73,9 +74,9 @@ def _identify_local_libraries(lib_objects):
local_lib_objects, external_lib_objects = [], []
for lib_object in lib_objects:
parsed_uri = urllib.parse.urlparse(lib_object.path)
if lib_object.lib_type == 'jar' and parsed_uri.scheme == '':
if lib_object.lib_type in supported_lib_types and parsed_uri.scheme == '':
local_lib_objects.append(lib_object)
elif lib_object.lib_type == 'jar' and parsed_uri.scheme.lower() == 'file':
elif lib_object.lib_type in supported_lib_types and parsed_uri.scheme.lower() == 'file':
# exactly 1 or 3
if parsed_uri.path.startswith('//') or parsed_uri.netloc != '':
raise RuntimeError('invalid file uri scheme, '
Expand Down
12 changes: 6 additions & 6 deletions tests/pipelines/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,31 +151,31 @@ def test_partition_local_remote(pipelines_api):
LibraryObject('jar', 'FILE:/all/caps.ext'),
LibraryObject('jar', 'FiLe:/weird/case.ext'),
LibraryObject('jar', 'file.ext'),
LibraryObject('whl', 'rel/path.ext'),
# shouldn't be uploaded
LibraryObject('jar', 'dbfs:/absolute/path/abc.ext'),
LibraryObject('jar', 's3:file:/file/scheme/abs/path.ext'),
LibraryObject('jar', 'scheme:file.ext'),
LibraryObject('jar', 'scheme:/abs/path.ext'),
LibraryObject('jar', 'scheme://abs/path.ext'),
LibraryObject('egg', 'file:/abs/path.ext'),
LibraryObject('whl', 'rel/path.ext')
LibraryObject('egg', 'file:/abs/path.ext')
]
expected_llo = [
LibraryObject('jar', '/absolute/path/abc.ext'),
LibraryObject('jar', 'relative/path.ext'),
LibraryObject('jar', '/file/scheme/abs/path.ext'),
LibraryObject('jar', '/all/caps.ext'),
LibraryObject('jar', '/weird/case.ext'),
LibraryObject('jar', 'file.ext')
LibraryObject('jar', 'file.ext'),
LibraryObject('whl', 'rel/path.ext')
]
expected_external = [
LibraryObject('jar', 'dbfs:/absolute/path/abc.ext'),
LibraryObject('jar', 's3:file:/file/scheme/abs/path.ext'),
LibraryObject('jar', 'scheme:file.ext'),
LibraryObject('jar', 'scheme:/abs/path.ext'),
LibraryObject('jar', 'scheme://abs/path.ext'),
LibraryObject('egg', 'file:/abs/path.ext'),
LibraryObject('whl', 'rel/path.ext')
LibraryObject('egg', 'file:/abs/path.ext')
]
llo, external = pipelines_api._identify_local_libraries(libraries)
assert llo == expected_llo
Expand Down Expand Up @@ -207,4 +207,4 @@ def test_library_object_serialization_deserialization():
assert llo == library_objects

libs = LibraryObject.to_json(library_objects)
assert libs == libraries
assert libs == libraries