Merge pull request #83 from Teester/rearrange

Teester · web-flow · commit f8ca66411fbc · 2025-10-21T21:56:21.000+01:00
Move api v1 and v2 related files into their own directories
diff --git a/entityshape/api_v1/api_v1_blueprint.py b/entityshape/api_v1/api_v1_blueprint.py
@@ -1,7 +1,7 @@
 from flask import Blueprint, request, json, Response
 
-from entityshape.shape import Shape
-from entityshape.compareshape import CompareShape
+from entityshape.api_v1.shape import Shape
+from entityshape.api_v1.compareshape import CompareShape
 
 api_v1 = Blueprint('api_v1', __name__,)
 
diff --git a/entityshape/api_v1/compareshape.py b/entityshape/api_v1/compareshape.py
diff --git a/entityshape/api_v1/shape.py b/entityshape/api_v1/shape.py
diff --git a/entityshape/api_v2/api_v2_blueprint.py b/entityshape/api_v2/api_v2_blueprint.py
@@ -1,7 +1,7 @@
 from flask import Blueprint, request, json, Response
 
-from entityshape.getjsonld import JSONLDShape
-from entityshape.comparejsonld import CompareJSONLD
+from entityshape.api_v2.getjsonld import JSONLDShape
+from entityshape.api_v2.comparejsonld import CompareJSONLD
 
 
 api_v2 = Blueprint('api_v2', __name__,)
diff --git a/entityshape/api_v2/comparejsonld.py b/entityshape/api_v2/comparejsonld.py
@@ -7,8 +7,8 @@
 import requests
 from requests import Response
 
-from entityshape.compareproperties import CompareProperties
-from entityshape.comparestatements import CompareStatements
+from entityshape.api_v2.compareproperties import CompareProperties
+from entityshape.api_v2.comparestatements import CompareStatements
 
 
 class CompareJSONLD:
diff --git a/entityshape/api_v2/compareproperties.py b/entityshape/api_v2/compareproperties.py
@@ -1,4 +1,4 @@
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class CompareProperties:
diff --git a/entityshape/api_v2/comparestatements.py b/entityshape/api_v2/comparestatements.py
@@ -1,6 +1,6 @@
 from typing import Tuple, Any
 
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class CompareStatements:
diff --git a/entityshape/api_v2/getjsonld.py b/entityshape/api_v2/getjsonld.py
diff --git a/entityshape/api_v2/utilities.py b/entityshape/api_v2/utilities.py
diff --git a/entityshape/app.py b/entityshape/app.py
@@ -4,8 +4,8 @@
 from flask import Flask
 from flask_cors import CORS
 
-from entityshape.api_v1_blueprint import api_v1
-from entityshape.api_v2_blueprint import api_v2
+from entityshape.api_v1.api_v1_blueprint import api_v1
+from entityshape.api_v2.api_v2_blueprint import api_v2
 
 app = Flask(__name__)
 CORS(app)
diff --git a/tests/test_compare_properties.py b/tests/test_compare_properties.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.comparejsonld import CompareProperties
+from entityshape.api_v2.comparejsonld import CompareProperties
 
 
 class TestCompareProperties(unittest.TestCase):
diff --git a/tests/test_compare_statements.py b/tests/test_compare_statements.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.comparejsonld import CompareStatements
+from entityshape.api_v2.comparejsonld import CompareStatements
 
 
 class TestCompareStatements(unittest.TestCase):
diff --git a/tests/test_jsonld.py b/tests/test_jsonld.py
@@ -3,10 +3,10 @@
 """
 import unittest
 
-from entityshape.comparejsonld import CompareJSONLD
-from entityshape.compareshape import CompareShape
-from entityshape.shape import Shape
-from entityshape.getjsonld import JSONLDShape
+from entityshape.api_v2.comparejsonld import CompareJSONLD
+from entityshape.api_v1.compareshape import CompareShape
+from entityshape.api_v1.shape import Shape
+from entityshape.api_v2.getjsonld import JSONLDShape
 
 
 class JSONLDCase(unittest.TestCase):
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class UtilitiesTests(unittest.TestCase):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from entityshape.utilities import Utilities`
	`1`	`+from entityshape.api_v2.utilities import Utilities`
`2`	`2`
`3`	`3`
`4`	`4`	`class CompareProperties:`