EP-3278 #33 #32 split openeo-processes and openeo-api submodules by v…

…ersion

Also moved from `data/` to `spec/` to escape git submodule rename hell

.gitignore

@@ -105,3 +105,5 @@ ENV/
 .idea
 /.project
 /.pydevproject
+
+openeo_driver/data

.gitmodules

@@ -1,6 +1,12 @@
-[submodule "openeo_driver/data/openeo-processes"]
-	path = openeo_driver/data/openeo-processes
+[submodule "openeo_driver/specs/openeo-processes/1.0"]
+	path = openeo_driver/specs/openeo-processes/1.0
 	url = https://github.com/Open-EO/openeo-processes.git
-[submodule "openeo_driver/data/openeo-api"]
-	path = openeo_driver/data/openeo-api
+[submodule "openeo_driver/specs/openeo-processes/0.4"]
+	path = openeo_driver/specs/openeo-processes/0.4
+	url = https://github.com/Open-EO/openeo-processes.git
+[submodule "openeo_driver/specs/openeo-api/1.0"]
+	path = openeo_driver/specs/openeo-api/1.0
+	url = https://github.com/Open-EO/openeo-api.git
+[submodule "openeo_driver/specs/openeo-api/0.4"]
+	path = openeo_driver/specs/openeo-api/0.4
 	url = https://github.com/Open-EO/openeo-api.git

openeo_driver/errors.py

@@ -28,11 +28,10 @@
 import json
 import re
 import textwrap
-import uuid
-from pathlib import Path
 from typing import List, Set
+import uuid
 
-import openeo_driver
+from openeo_driver.specs import SPECS_ROOT
 
 
 class OpenEOApiException(Exception):
@@ -587,7 +586,7 @@ class OpenEOApiErrorSpecHelper:
 
     def __init__(self, spec: dict = None):
         if spec is None:
-            with (Path(openeo_driver.__file__).parent / 'data/openeo-api/errors.json').open('r', encoding='utf-8') as f:
+            with (SPECS_ROOT / 'openeo-api/0.4/errors.json').open('r', encoding='utf-8') as f:
                 spec = json.load(f)
         self._spec = spec
 

openeo_driver/processes.py

@@ -1,10 +1,10 @@
 import functools
 import json
-import warnings
 from pathlib import Path
 from typing import Callable, Dict
+import warnings
 
-import openeo_driver
+from openeo_driver.specs import SPECS_ROOT
 
 
 class ProcessSpec:
@@ -70,7 +70,7 @@ class ProcessRegistry:
     """
 
     def __init__(self):
-        self._processes_spec_root = Path(openeo_driver.__file__).parent / 'data/openeo-processes'
+        self._processes_spec_root = SPECS_ROOT / 'openeo-processes/0.4'
         # Dictionary of registered process spec dicts (keyed by process id)
         self._specs = {}
         # Dictionary of registered process functions (keyed by function name), includes legacy processes without spec

openeo_driver/specs/__init__.py

@@ -0,0 +1,3 @@
+from pathlib import Path
+
+SPECS_ROOT = Path(__file__).parent

tests/test_errors.py

@@ -31,7 +31,8 @@ def test_extract_placeholders():
 def test_unknown_error_codes():
     from_spec = set(OpenEOApiErrorSpecHelper().get_error_codes())
     defined = set(get_defined_exceptions().keys())
-    assert defined.difference(from_spec) == set()
+    defined_but_not_in_spec = defined.difference(from_spec)
+    assert defined_but_not_in_spec == set()
 
 
 def test_generate_exception_class():