Merge pull request #69 from ODM2/renamevalueobjects

Merge branch: Renamevalueobjects

Author: Stephanie Reeder

Examples/APIDemo.ipynb

@@ -2,7 +2,7 @@
 
 
 
-# import matplotlib.pyplot as plt
+#import matplotlib.pyplot as plt
 
 
 
@@ -17,8 +17,8 @@
 #connect to database
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
-session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
-# session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
+# session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
+session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
 # session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 # session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/ODM2/usecases/WOF_to_ODM2/ODM2.sqlite', 2.0)
 

Examples/Sample.py

@@ -4,12 +4,11 @@ channels:
 dependencies:
   - python=2.7
   - pip
-  - ipython-notebook
+  - jupyter
   - scipy
   - pandas
   - seaborn
   - sqlalchemy
   - psycopg2
   - pymysql
   - pyodbc
-  - shapely

condaenvironment_1.yml

@@ -1,8 +1,8 @@
 __author__ = 'stephanie'
 # from cv_service import CVService, refreshDB
-from series_service import  ODM, SeriesService
-from edit_service import  EditService
-from export_service import ExportService
+from odm2api.ODM1_1_1.services.series_service import ODM, SeriesService
+from odm2api.ODM1_1_1.services.edit_service import  EditService
+from odm2api.ODM1_1_1.services.export_service import ExportService
 
 __all__ = [ 'SeriesService', 'EditService', 'ExportService', 'ODM']
 # 'CVService',

odm2api/ODM1_1_1/services/__init__.py

@@ -1,7 +1,7 @@
 import sqlite3
 
 #from ...versionSwitcher import ODM
-from series_service import SeriesService
+from odm2api.ODM1_1_1.services import SeriesService
 
 #from odmtools.odmdata import series as series_module
 

odm2api/ODM1_1_1/services/edit_service.py

@@ -31,7 +31,7 @@
 from series import copy_series
 from data_value import copy_data_value
 '''
-import models
+import odm2api.ODM1_1_1.models
 
 __all__ = [
     'Base',

odm2api/ODM2/LikeODM1/__init__.py

@@ -38,9 +38,9 @@
     'updateExtensionProperties'
 ]
 '''
-from createService import CreateODM2
-from deleteService import DeleteODM2
-from readService import ReadODM2
-from updateService import UpdateODM2
+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
 
 __all__= ['CreateODM2', 'DeleteODM2', 'ReadODM2', 'UpdateODM2' ]

odm2api/ODM2/models.py

@@ -151,7 +151,7 @@ def createSimulation(self, simulation):
     def createTimeSeriesResultValues(self, datavalues):
         try:
             tablename = TimeSeriesResultValues.__tablename__
-            print "I am TS saving name the table name"+ tablename
+            #print ("I am TS saving name the table name", tablename)
             datavalues.to_sql(name="TimeSeriesResultValues",
                               schema=TimeSeriesResultValues.__table_args__['schema'],
                               if_exists='append',

odm2api/ODM2/services/__init__.py

@@ -3,9 +3,9 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from .ODM2.models import Variables as Variable2, setSchema
+from odm2api.ODM2.models import Variables as Variable2, setSchema
 #from .versionSwitcher import ODM, refreshDB #import Variable as Variable1
-from .ODM1_1_1.services import ODM#, refreshDB
+from odm2api.ODM1_1_1.services import ODM#, refreshDB
 import urllib
 import sys
 import os

odm2api/ODM2/services/createService.py

@@ -1,7 +1,7 @@
 pyodbc
 six
 sqlalchemy
--e git+https://github.com/ODM2/[email protected]#egg=geoalchemy-0.7.4
-shapely
+#-e git+https://github.com/ODM2/[email protected]#egg=geoalchemy-0.7.4
+#shapely
 pandas
 #psycopg2  # Commented out because I could not pip install it.