summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-13 10:11:35 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-13 10:11:35 -0300
commitfc434146593060c1fc454776b1feaaa80a700823 (patch)
treea7c2be8f9ad6f2417c3e3c239a6cd0de30eed854
parent0ff122cf9fd0a76871093b595910fb7c0d3bfe85 (diff)
Revert jsonschema version to <=0.8
-rw-r--r--pkg/requirements.pip4
-rw-r--r--src/leap/services/eip/eipspec.py10
2 files changed, 6 insertions, 8 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 7f5eb5b0..e47e0bff 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -1,7 +1,7 @@
# in order of addition to the project.
# do not change the ordering.
-jsonschema
+jsonschema<=0.8
requests
srp>=1.0.2
pyopenssl
@@ -9,4 +9,4 @@ keyring
pyxdg
argparse
PySide
-python-dateutil \ No newline at end of file
+python-dateutil
diff --git a/src/leap/services/eip/eipspec.py b/src/leap/services/eip/eipspec.py
index d5c73056..69d4d927 100644
--- a/src/leap/services/eip/eipspec.py
+++ b/src/leap/services/eip/eipspec.py
@@ -18,18 +18,16 @@
eipservice_config_spec = {
'description': 'sample eip service config',
'type': 'object',
- 'required': [
- 'serial',
- 'version'
- ],
'properties': {
'serial': {
'type': int,
- 'default': 1
+ 'default': 1,
+ 'required': True
},
'version': {
'type': int,
- 'default': 1
+ 'default': 1,
+ 'required': True
},
'clusters': {
'type': list,