Update some test code

fix global import in odm_1_1_1

Author: valentinedwv

odm2api/ODM1_1_1/services/series_service.py

@@ -23,11 +23,14 @@ class SeriesService(serviceBase):
     def refreshDB(self, ver):
         self._version= ver
         if ver == 1.1:
-            global ODM
+            #global ODM
             ODM = ODM1
         elif ver == 2.0:
-            global ODM
+            #global ODM
             ODM = ODM2
+        else:
+            #global ODM
+            ODM = ODM1
 
     def reset_session(self):
         self._session = self._session_factory.getSession()  # Reset the session in order to prevent memory leaks

requirements.txt

@@ -9,7 +9,8 @@ sqlalchemy
 
 shapely
 
-matplotlib
+#matplotlib
 dateutils
+pandas
 
-sqlalchemy-migrate
+#sqlalchemy-migrate

requirements_tests.txt

@@ -0,0 +1,21 @@
+six
+sqlalchemy
+-e git+https://github.com/ODM2/geoalchemy.git@odm2
+#Change line #242 in geoalchemy/base.py
+#from:
+#class SpatialComparator(ColumnProperty.ColumnComparator):
+#to :
+#class SpatialComparator(ColumnProperty.Comparator):
+
+shapely
+
+#matplotlib
+dateutils
+pandas
+
+#db support
+pymysql
+pysqlite
+pyspatialite
+
+#sqlalchemy-migrate

setup.py

@@ -78,6 +78,7 @@
 
     install_requires=['pandas', 'sqlalchemy', 'geoalchemy>=0.7.3.dev',
                       'pyodbc', 'pymysql', 'psycopg2', 'shapely'],
+    # dependency_links- geoalchemy from the ODM repository
     dependency_links=[
         "git+https://github.com/ODM2/geoalchemy.git@odm2#egg=geoalchemy-0.7.3.dev"
     ],

tests/test_util1_1_1.py

@@ -1,7 +1,7 @@
 import datetime
 
-from odm2api.ODM1_1_1 import *
-
+from odm2api.ODM1_1_1.models import *
+from odm2api import base as Base
 
 def build_db(engine):
     Base.metadata.create_all(engine)