Move api v1 and v2 related files into their own directories

entityshape/api_v1_blueprint.py → 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__,)
 

entityshape/api_v2_blueprint.py → 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__,)

entityshape/comparejsonld.py → 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:

entityshape/compareproperties.py → entityshape/api_v2/compareproperties.py

@@ -1,4 +1,4 @@
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class CompareProperties:

entityshape/comparestatements.py → 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:

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)

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):

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):

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):

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):