Updated odm2api module path calls in tests/test_odm2 modules to remove deprecated use of ODM2 module hierarchy

tests/test_SessionFactory.py

@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.models import CVElevationDatum, setSchema
 from odm2api.ODMconnection import SessionFactory
+from odm2api.models import CVElevationDatum, setSchema
 
 import pytest
 
@@ -15,10 +15,10 @@
     ['mysql"root@Localhost/odm2', 'mysql', 'mysql+pymysql://root@localhost/odm2'],
     ['postgresql_marchantariats_none', 'postgresql',
      'postgresql+psycopg2://postgres:None@localhost/marchantariats',
-     'marchantariats', 'postgres',  None],
+     'marchantariats', 'postgres', None],
     ['postgresql_marchantariats_empty', 'postgresql',
      'postgresql+psycopg2://postgres@localhost/marchantariats',
-     'marchantariats', 'postgres',  None],
+     'marchantariats', 'postgres', None],
     ['sqlite_wof', 'sqlite', 'sqlite:///./tests/spatialite/wof2odm/ODM2.sqlite', None, None, None]
 ]
 

tests/test_connection.py

@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.models import CVElevationDatum
 from odm2api.ODMconnection import dbconnection
+from odm2api.models import CVElevationDatum
 
 import pytest
 
@@ -13,7 +13,7 @@
 dbs_readonly = [
     ['mysql_odm2_odm', 'mysql', 'localhost', 'odm2', 'ODM', 'odm'],
     ['mysql_odm2_root', 'mysql', 'localhost', 'odm2', 'root', None],
-    ['postgresql_marchantariats', 'postgresql', 'localhost', 'marchantariats', 'postgres',  'iforget'],
+    ['postgresql_marchantariats', 'postgresql', 'localhost', 'marchantariats', 'postgres', 'iforget'],
     ['sqlite_wof', 'sqlite', './tests/spatialite/wof2odm/ODM2.sqlite', None, None, None]
 ]
 

tests/test_odm2/test_createservice.py

@@ -4,9 +4,9 @@
 import uuid
 from os.path import abspath, dirname, join
 
-from odm2api.ODM2 import models
-from odm2api.ODM2.services.createService import CreateODM2
+from odm2api import models
 from odm2api.ODMconnection import dbconnection
+from odm2api.services.createService import CreateODM2
 
 import pytest
 # run this test from the root directory using:

tests/test_odm2/test_model.py

@@ -1,7 +1,7 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.models import (CVElevationDatum, CVSamplingFeatureGeoType,
-                                 CVSamplingFeatureType, SamplingFeatures)
+from odm2api.models import (CVElevationDatum, CVSamplingFeatureGeoType,
+                            CVSamplingFeatureType, SamplingFeatures)
 
 import pytest
 

tests/test_odm2/test_odm2.py

@@ -1,11 +1,12 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.models import Methods, Models, People, ProcessingLevels, RelatedModels, Variables
-from odm2api.ODM2.services.createService import CreateODM2
-from odm2api.ODM2.services.deleteService import DeleteODM2
-from odm2api.ODM2.services.readService import ReadODM2
-from odm2api.ODM2.services.updateService import UpdateODM2
 from odm2api.ODMconnection import dbconnection
+from odm2api.models import (Methods, Models, People,
+                            ProcessingLevels, RelatedModels, Variables)
+from odm2api.services.createService import CreateODM2
+from odm2api.services.deleteService import DeleteODM2
+from odm2api.services.readService import ReadODM2
+from odm2api.services.updateService import UpdateODM2
 
 import pytest