Use v1.1.0 instead of v1.0.2

Additional resources is a minor change rather than bug fix.

hepdata_validator/__init__.py

@@ -30,7 +30,7 @@
 
 __all__ = ('__version__', )
 
-VALID_SCHEMA_VERSIONS = ['1.0.2', '1.0.1', '1.0.0', '0.1.0']
+VALID_SCHEMA_VERSIONS = ['1.1.0', '1.0.1', '1.0.0', '0.1.0']
 LATEST_SCHEMA_VERSION = VALID_SCHEMA_VERSIONS[0]
 
 RAW_SCHEMAS_URL = 'https://raw.githubusercontent.com/HEPData/hepdata-validator/' \

hepdata_validator/schemas/1.0.2/additional_info_schema.json → hepdata_validator/schemas/1.1.0/additional_info_schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://hepdata.net/submission/schemas/1.0.2/additional_info_schema.json",
+  "$id": "https://hepdata.net/submission/schemas/1.1.0/additional_info_schema.json",
   "title": "Additional information",
   "description": "Optional information concerning a whole submission rather than individual data tables",
   "type": "object",
@@ -47,7 +47,7 @@
       }
     },
     "additional_resources": {
-      "$ref": "https://hepdata.net/submission/schemas/1.0.2/additional_resources_schema.json"
+      "$ref": "https://hepdata.net/submission/schemas/1.1.0/additional_resources_schema.json"
     },
     "comment": {
       "type": "string",

hepdata_validator/schemas/1.0.2/additional_resources_schema.json → hepdata_validator/schemas/1.1.0/additional_resources_schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://hepdata.net/submission/schemas/1.0.2/additional_resources_schema.json",
+  "$id": "https://hepdata.net/submission/schemas/1.1.0/additional_resources_schema.json",
   "title": "Additional resources",
   "type": "array",
   "items": {

hepdata_validator/schemas/1.0.2/data_schema.json → hepdata_validator/schemas/1.1.0/data_schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://hepdata.net/submission/schemas/1.0.2/data_schema.json",
+  "$id": "https://hepdata.net/submission/schemas/1.1.0/data_schema.json",
   "title": "Data table",
   "description": "A HEPData table comprising independent_variables and dependent_variables",
   "type": "object",

hepdata_validator/schemas/1.0.2/submission_schema.json → hepdata_validator/schemas/1.1.0/submission_schema.json

@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://hepdata.net/submission/schemas/1.0.2/submission_schema.json",
+  "$id": "https://hepdata.net/submission/schemas/1.1.0/submission_schema.json",
   "title": "Submission table",
   "description": "Metadata for a HEPData table apart from independent_variables and dependent_variables",
   "type": "object",
@@ -39,7 +39,7 @@
       "additionalProperties": false
     },
     "additional_resources": {
-      "$ref": "https://hepdata.net/submission/schemas/1.0.2/additional_resources_schema.json"
+      "$ref": "https://hepdata.net/submission/schemas/1.1.0/additional_resources_schema.json"
     },
     "table_doi": {
       "type": "string",

hepdata_validator/schemas/additional_info_schema.json

@@ -1 +1 @@
-1.0.2/additional_info_schema.json
+1.1.0/additional_info_schema.json

hepdata_validator/schemas/additional_resources_schema.json

@@ -1 +1 @@
-1.0.2/additional_resources_schema.json
+1.1.0/additional_resources_schema.json

hepdata_validator/schemas/data_schema.json

@@ -1 +1 @@
-1.0.2/data_schema.json
+1.1.0/data_schema.json

hepdata_validator/schemas/submission_schema.json

@@ -1 +1 @@
-1.0.2/submission_schema.json
+1.1.0/submission_schema.json

hepdata_validator/submission_file_validator.py

@@ -30,7 +30,7 @@ def __init__(self, *args, **kwargs):
         super(SubmissionFileValidator, self).__init__(*args, **kwargs)
         self.default_schema_file = self._get_schema_filepath(self.submission_filename)
         self.additional_info_schema = self._get_schema_filepath(self.additional_info_filename)
-        if self.schema_version >= packaging_version.parse("1.0.2"):
+        if self.schema_version >= packaging_version.parse("1.1.0"):
             self.additional_resources_schema = self._get_schema_filepath(self.additional_resources_filename)
 
     def validate(self, **kwargs):
@@ -55,7 +55,7 @@ def validate(self, **kwargs):
                 additional_file_section_schema = json.load(additional_schema)
 
             resolver = None
-            if self.schema_version >= packaging_version.parse("1.0.2"):
+            if self.schema_version >= packaging_version.parse("1.1.0"):
                 with open(self.additional_resources_schema, 'r') as additional_schema:
                     additional_resources_schema = json.load(additional_schema)
 
@@ -91,7 +91,7 @@ def validate(self, **kwargs):
                 except ValidationError as ve:
                     self.add_validation_error(file_path, ve)
 
-            if self.schema_version >= packaging_version.parse("1.0.2"):
+            if self.schema_version >= packaging_version.parse("1.1.0"):
                 self.check_for_duplicates(file_path, table_names, table_data_files)
 
             if not self.has_errors(file_path):

testsuite/test_data_validator.py

@@ -23,7 +23,7 @@ def validator_v0():
 
 @pytest.fixture(scope="module")
 def validator_v1():
-    return DataFileValidator(schema_version='1.0.2')
+    return DataFileValidator(schema_version='1.1.0')
 
 
 ####################################################

testsuite/test_full_submission_validator.py

@@ -18,7 +18,7 @@ def validator_v0():
 
 @pytest.fixture()
 def validator_v1():
-    return FullSubmissionValidator(schema_version='1.0.2')
+    return FullSubmissionValidator(schema_version='1.1.0')
 
 
 def test_valid_submission_dir(validator_v1, data_path, capsys):

testsuite/test_submission_validator.py

@@ -29,7 +29,7 @@ def validator_v0():
 
 @pytest.fixture(scope="module")
 def validator_v1():
-    return SubmissionFileValidator(schema_version='1.0.2')
+    return SubmissionFileValidator(schema_version='1.1.0')
 
 
 ####################################################