Changed json validation in two more files #591

Author: knirirr

isatools/convert/isatab2cedar.py

@@ -41,8 +41,7 @@ def createCEDARjson(self, work_dir, json_dir, inv_identifier):
             schema = json.load(json_fp)
         if schema is None:
             raise IOError("Could not load schema from {}".format(join(CEDAR_SCHEMA_PATH, schema_file)))
-        resolver = RefResolver("file://{}".format(join(CEDAR_SCHEMA_PATH, schema_file)), schema)
-        validator = Draft4Validator(schema, resolver=resolver)
+        validator = Draft4Validator(schema)
 
         isa_tab = isatab_parser.parse(work_dir)
 
@@ -121,7 +120,7 @@ def createCEDARjson(self, work_dir, json_dir, inv_identifier):
                 study_identifier = ""
 
             try:
-                validator.validate(cedar_json, schema)
+                validator.validate(cedar_json)
             except ValidationError as e:
                 error_file_name = os.path.join(json_dir, "error.log")
                 with open(error_file_name, "w") as errorfile:

isatools/convert/isatab2json.py

@@ -140,9 +140,8 @@ def convert(self, work_dir):
             # validate json
             with open(join(SCHEMAS_PATH, INVESTIGATION_SCHEMA)) as json_fp:
                 schema = json.load(json_fp)
-                resolver = RefResolver("file://" + join(SCHEMAS_PATH, INVESTIGATION_SCHEMA), schema)
-                validator = Draft4Validator(schema, resolver=resolver)
-                validator.validate(isa_json, schema)
+                validator = Draft4Validator(schema)
+                validator.validate(isa_json)
 
                 log.info("Conversion finished")
                 return isa_json