Commit cb8342ca authored by Valentin Reis's avatar Valentin Reis

Merge branch 'nrm-yaml' into 'master'

[feature] Move the manifest file format from JSON to YAML.

See merge request !93
parents abc03f50 34e645be
Pipeline #7464 passed with stages
in 5 minutes and 25 seconds
...@@ -7,6 +7,7 @@ name = "pypi" ...@@ -7,6 +7,7 @@ name = "pypi"
"e1839a8" = {path = ".", editable = true} "e1839a8" = {path = ".", editable = true}
six = "==1.11.0" six = "==1.11.0"
pyzmq = "*" pyzmq = "*"
PyYaml = "*"
tornado = "*" tornado = "*"
numpy = "*" numpy = "*"
warlock = "*" warlock = "*"
......
{
"name": "basic",
"version": "0.0.1",
"app": {
"container": {
"cpus": 2,
"mems": 1
}
}
}
name: basic
version: 0.0.1
app:
container:
cpus: 2
mems: 1
{
"name": "basic",
"version": "0.0.1",
"app": {
"container": {
"cpus": 2,
"mems": 1
}
},
"image": {
"path": "docker://ubuntu",
"type": "docker",
"binds": [
"/nix"
]
}
}
---
name: basic
version: 0.0.1
app:
container:
cpus: 2
mems: 1
image:
path: docker://ubuntu
type: docker
binds:
- "/nix"
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
from __future__ import print_function from __future__ import print_function
from aci import ImageManifest from aci import ImageManifest
from json import load from yaml import load
from collections import namedtuple from collections import namedtuple
import logging import logging
from subprograms import ChrtClient, NodeOSClient, resources, SingularityClient from subprograms import ChrtClient, NodeOSClient, resources, SingularityClient
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment