Skip to content
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

Add structure to project and global calibanconfig schema #56

Merged
merged 2 commits into from
Jul 24, 2020
Merged

Add structure to project and global calibanconfig schema #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca08a43
separate config, add julia version
Jul 24, 2020
f124926
split out project config
Jul 24, 2020
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
34 changes: 27 additions & 7 deletions caliban/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,34 @@ def expand_image(image: str) -> str:
""""base_image" entry must be a string OR dict with 'cpu' and 'gpu' keys, not '{}'"""
)

CalibanConfig = s.Schema({
s.Optional("build_time_credentials", default=False): bool,
s.Optional("default_mode", default=JobMode.CPU): s.Use(JobMode.parse),
GCloudConfig = {
s.Optional("project_id"): s.And(str, len),
s.Optional("cloud_key"): s.And(str, len),
s.Optional("base_image", default=None): BaseImage,
s.Optional("apt_packages", default=AptPackages.validate({})): AptPackages
})
s.Optional("cloud_key"): s.And(str, len)
}

# Config items that are project-specific, and don't belong in a global
# .calibanconfig shared between projects.
ProjectConfig = {
s.Optional("build_time_credentials", default=False):
bool,
s.Optional("base_image", default=None):
BaseImage,
s.Optional("apt_packages", default=AptPackages.validate({})):
AptPackages,
# If present, Caliban will attempt to install Julia into the base container.
s.Optional("julia_version", default=None):
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one's for you, @eschnett . I'll open up a separate PR that integrates your Julia work into caliban.build and pulls the version from this key. What do you think?

s.And(str, s.Use(lambda s: s.strip())),
}

# Elements of calibanconfig that are fair game to share between projects.
#
SystemConfig = {
s.Optional("default_mode", default=JobMode.CPU): s.Use(JobMode.parse),
s.Optional("gcloud", default={}): GCloudConfig,
}

# The final, parsed calibanconfig.
CalibanConfig = s.Schema({**ProjectConfig, **SystemConfig})

# Accessors

Expand Down