update tests, add iss files for windows setup

Author: sreeder

.travis.yml

@@ -0,0 +1,59 @@
+language: python
+sudo: required
+# if the https://travis-ci.org/ODM2/ODMToolsPython/requests ever says: missing config
+# validate at: http://lint.travis-ci.org/
+python:
+#  - "2.6"
+  - "2.7"
+#  - "3.2"
+#  - "3.3"
+#  - "3.4"
+#  - "3.5"
+#  - "3.5-dev" # 3.5 development branch
+#  - "nightly" # currently points to 3.6-dev
+# command to install dependencies
+cache:
+  directories:
+    - $HOME/.cache/pip/wheels
+    - $HOME/virtualenv/python2.7.9
+services:
+  - mysql
+  - postgresql
+addons:
+  apt:
+    packages:
+      - cmake
+      - unixodbc
+      - unixodbc-dev
+      - odbcinst1debian2
+      - odbcinst
+      - freetds-dev
+      - freetds-bin
+      - tdsodbc
+      - libc6
+      - e2fsprogs
+      - mysql-client
+      - libproj-dev
+#  mariadb: '10.1'
+before_script:
+  - ./scripts/tests/mysql_setup.sh
+  - ./scripts/tests/postgres_setup.sh
+  - ./scripts/tests/freetds.sh
+
+before_install:
+# python -m pip makes the install go into the virtualenv
+  - python -m pip install pandas
+  - export PYMSSQL_BUILD_WITH_BUNDLED_FREETDS=1;python -m  pip install pymssql
+#  - python -m  pip install mysql-python
+install: # now just our code
+  - pip install geoalchemy2
+  - pip install  -r requirements_tests.txt  --allow-external pyodbc --allow-unverified pyodbc
+  - pip list
+
+# don't forget to open up the azure mssql server to these addreses
+# https://docs.travis-ci.com/user/ip-addresses/
+
+# command to run tests
+script:
+  - py.test
+

odmtools/controller/frmBulkInsert.py

@@ -63,6 +63,7 @@ def readDataFromCSV(self, filepath):
                                 8: str.strip,
                                 9: str.strip})
         except CParserError as e:
+
             msg = wx.MessageDialog(None, "There was an issue trying to parse your file. "
                                          "Please compare your csv with the template version as the file"
                                          " you provided "

odmtools/controller/frmSeriesSelector.py

@@ -84,10 +84,6 @@ def refreshTableSeries(self, db):
 
         :return:
         """
-
-        chcklist=  self.tblSeries.GetCheckedObjects()
-
-
         self.memDB.set_series_service(db)
         object = self.series_service.get_all_series()
         #checkedObjs = self.tblSeries.GetCheckedObjects()
@@ -97,10 +93,6 @@ def refreshTableSeries(self, db):
             if x.id not in idList:
                 self.tblSeries.AddObject(x)
 
-
-        for c in chcklist:
-            self.tblSeries.SetCheckState(c, True)
-
         #for x in checkedObjs:
         #    super(FastObjectListView, self.tblSeries).SetCheckState(x, True)
 
@@ -109,18 +101,10 @@ def refreshSeries(self):
 
         :return:
         """
-        chcklist=  self.tblSeries.GetCheckedObjects()
         self.series_service = None
-
         self.series_service = self.parent.Parent.createService()
         #self.refreshTableSeries(self.dbservice)
         self.resetDB(self.series_service)
-        for c in chcklist:
-            for val in self.tblSeries.GetObjects():
-                if c == val:
-                    self.tblSeries.SetCheckState(val, True)
-                    break
-
         logger.debug("Repopulate Series Selector")
 
     def initSVBoxes(self):
@@ -574,14 +558,9 @@ def stopEdit(self):
 
         :return:
         """
-
         self.isEditing = False
-        chcklist= self.tblSeries.GetCheckedObjects()
-
         self.tblSeries.RefreshObject(self.tblSeries.editingObject)
-        for c in chcklist:
-            self.tblSeries.SetCheckState(c, True)
-
+        self.tblSeries.editingObject = None
         self.memDB.stopEdit()
 
     def isEditing(self):

odmtools/controller/logicPlotOptions.py

@@ -125,20 +125,11 @@ def getEditSeriesID(self):
         else:
             return None
 
-
-
-
-    def updateEditSeries(self):
-        #update values
-        if self.editID in self._seriesInfos:
-            # self._seriesInfos[self.editID].dataTable = self.memDB.getEditDataValuesforGraph()
-            data =self.memDB.getEditDataValuesforGraph()
-            self._seriesInfos[self.editID].dataTable = data
-
     def setEditSeries(self, seriesID):
 
         self.editID = int(seriesID)
         # self.memDB.initEditValues(self.editID)
+
         if self.editID not in self._seriesInfos:
             self.update(self.editID, True)
             # self.getSeriesInfo(self.editID)
@@ -153,6 +144,15 @@ def setEditSeries(self, seriesID):
             self._seriesInfos[self.editID].plotcolor = self._seriesInfos[self.editID].color
             self._seriesInfos[self.editID].color = "Black"
 
+
+    def updateEditSeries(self):
+        #update values
+        if self.editID in self._seriesInfos:
+            # self._seriesInfos[self.editID].dataTable = self.memDB.getEditDataValuesforGraph()
+            data =self.memDB.getEditDataValuesforGraph()
+            self._seriesInfos[self.editID].dataTable = data
+
+
     def stopEditSeries(self):
         if self.editID in self._seriesInfos:
             data = self.memDB.getDataValuesforGraph(

odmtools/gui/frmODMTools.py

@@ -38,6 +38,7 @@ class frmODMToolsMain(wx.Frame):
 
     def __init__(self, **kwargs):
         """
+
         """
 
         self.taskserver = kwargs.pop('taskServer')
@@ -437,18 +438,12 @@ def addEdit(self, event):
 
     def stopEdit(self, event):
 
-        val = wx.MessageBox( "Are you sure you want to stop editing",
-                            'Stop Editing?', wx.YES_NO | wx.ICON_QUESTION, parent=self)
-        if val == 2:  #_YES
-
-            self.pnlSelector.stopEdit()
-
-            self.dataTable.stopEdit()
-            self.pnlPlot.stopEdit()
-            Publisher.sendMessage("toggleEdit", checked=False)
-            self.memDB.reset_edit()
-            self.record_service = None
-            self._ribbon.toggleEditButtons(False)
+        self.pnlSelector.stopEdit()
+        self.dataTable.stopEdit()
+        self.pnlPlot.stopEdit()
+        Publisher.sendMessage("toggleEdit", checked=False)
+        self.record_service = None
+        self._ribbon.toggleEditButtons(False)
 
 
     def getRecordService(self):

odmtools/gui/mnuPlotToolbar.py

@@ -149,11 +149,8 @@ def stopEdit(self):
         self.xys = None
         self.editCurve = None
         self.lassoAction = None
-        # untoggle select button
-        self.ToggleTool(self.select_tool.Id, False)
         # disable select button
         self.select_tool.Enable(False)
-
         self.zoom_to_data.Enable(False)
         self.Realize()
         #untoggle lasso button

odmtools/gui/plotTimeSeries.py

@@ -176,6 +176,7 @@ def changePlotSelection(self, filtered_datetime):
     def lassoChangeSelection(self, filtered_datetime):
         self.parent.record_service.select_points(dataframe=filtered_datetime)
 
+
     def onShowLegend(self, isVisible):
         if isVisible:
             self.isShowLegendEnabled = True
@@ -303,6 +304,10 @@ def Plot(self, seriesPlotInfo):
         self.toolbar.update()
         self.toolbar.push_current()
 
+        #self._views.home()
+        #self._positions.home()
+        #self.set_history_buttons()
+
     #clear plot
     def clear(self):
         """
@@ -314,7 +319,12 @@ def clear(self):
         for key, ax in self.axislist.items():
             ax.clear()
         self.axislist = {}
-
+        #self.canvas.draw()
+            # self.stopEdit()
+        #print "TimeSeries: ", dir(self.timeSeries), type(self.timeSeries)
+        #plt.cla()
+        #plt.clf()
+        #self.timeSeries.plot([], [], picker=5)
 
 
     def setUpYAxis(self):

odmtools/odmdata/series.py

@@ -96,22 +96,6 @@ class Series(Base):
     def __repr__(self):
         return "<Series('%s', '%s', '%s', '%s')>" % (self.id, self.site_name, self.variable_code, self.variable_name)
 
-    def __eq__(self, other) :
-        # return self.__dict__ == other.__dict__
-        return [self.id, self.site_id, self.site_code, self.site_name, self.variable_id, self.variable_code,
-                self.variable_name, self.speciation, self.variable_units_id, self.variable_units_name,
-                self.sample_medium, self.value_type, self.time_support, self.time_units_id, self.time_units_name,
-                self.data_type, self.general_category, self.method_id, self.method_description,
-                self.source_id, self.source_description, self.organization, self.citation,
-                self.quality_control_level_id, self.quality_control_level_code, self.begin_date_time,
-                self.end_date_time, self.begin_date_time_utc, self.end_date_time_utc, self.value_count] ==\
-               [other.id, other.site_id, other.site_code, other.site_name, other.variable_id, other.variable_code,
-                other.variable_name, other.speciation, other.variable_units_id, other.variable_units_name,
-                other.sample_medium, other.value_type, other.time_support, other.time_units_id, other.time_units_name,
-                other.data_type, other.general_category, other.method_id, other.method_description,
-                other.source_id, other.source_description, other.organization, other.citation,
-                other.quality_control_level_id, other.quality_control_level_code, other.begin_date_time,
-                other.end_date_time, other.begin_date_time_utc, other.end_date_time_utc, other.value_count]
 
     def get_table_columns(self):
         return self.__table__.columns.keys()

odmtools/odmservices/service_manager.py

@@ -26,7 +26,7 @@ def __init__(self, debug=False):
         f = self._get_file('r')
         self._conn_dicts = []
         self.version = 0
-
+        self._connection_format = "%s+%s://%s:%s@%s/%s"
 
         # Read all lines (connections) in the connection.cfg file
         while True:
@@ -185,62 +185,30 @@ def _get_file(self, mode):
 
         return config_file
 
-    # def _build_connection_string(self, conn_dict):
-    #     driver = ""
-    #     connformat= self._connection_format
-    #     if conn_dict['engine'] == 'mssql' and sys.platform != 'win32':
-    #         driver = "pyodbc"
-    #         quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password']))
-    #         conn_string = 'mssql+pyodbc:///?odbc_connect={}'.format(quoted)
-    #
-    #     else:
-    #         if conn_dict['engine'] == 'mssql':
-    #             driver = "pyodbc"
-    #             connformat=self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
-    #         elif conn_dict['engine'] == 'mysql':
-    #             driver = "pymysql"
-    #         elif conn_dict['engine'] == 'postgresql':
-    #             driver = "psycopg2"
-    #         else:
-    #             driver = "None"
-    #
-    #         conn_string = connformat % (
-    #             conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
-    #             conn_dict['db'])
-    #     return conn_string
     def _build_connection_string(self, conn_dict):
-        # driver = ""
-        # print "****", conn_dict
-
+        driver = ""
+        connformat= self._connection_format
         if conn_dict['engine'] == 'mssql' and sys.platform != 'win32':
             driver = "pyodbc"
-            #'DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password'])
             quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password']))
             conn_string = 'mssql+pyodbc:///?odbc_connect={}'.format(quoted)
+        
         else:
-            self._connection_format = "%s+%s://%s:%s@%s/%s"
             if conn_dict['engine'] == 'mssql':
                 driver = "pyodbc"
-                #self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
-                conn = "%s+%s://%s:%s@%s/%s?driver=SQL+Server"
-                if "sqlncli11.dll" in os.listdir("C:\\Windows\\System32"):
-                    conn = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+11.0"
-                self._connection_format = conn
+                connformat=self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
             elif conn_dict['engine'] == 'mysql':
                 driver = "pymysql"
             elif conn_dict['engine'] == 'postgresql':
                 driver = "psycopg2"
             else:
                 driver = "None"
 
-            conn_string = self._connection_format % (
+            conn_string = connformat % (
                 conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
                 conn_dict['db'])
-
-        # print "******", conn_string
         return conn_string
 
-
     def _save_connections(self):
         f = self._get_file('w')
         for conn in self._conn_dicts:

requirements.txt

@@ -6,7 +6,15 @@ scipy
 #psycopg2
 sqlalchemy
 matplotlib
-pandas
-geoalchemy2
-#wxpython
-
+#pandas
+#geoalchemy2
+addons:
+  apt:
+    packages:
+      # for wxPython:
+      - python-wxgtk2.8
+      - python-wxtools
+      - wx2.8-doc
+      - wx2.8-examples
+      - wx2.8-headers
+      - wx2.8-i18n