Beta 1.2.5

.gitignore

@@ -63,6 +63,7 @@ setup/Output/setup.exe
 
 #folders
 Temp
+
 *.app
 *.spec
 

.travis.yml

@@ -41,16 +41,19 @@ addons:
       - wx2.8-headers
       - wx2.8-i18n
 
+
 #  mariadb: '10.1'
 before_script:
-  - ./scripts/tests/mysql_setup.sh
-  - ./scripts/tests/postgres_setup.sh
-  - ./scripts/tests/freetds.sh
+  - ./ci-helpers/travis/mysql_setup.sh
+  - ./ci-helpers/travis/postgres_setup.sh
+  - ./ci-helpers/travis/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
@@ -60,8 +63,17 @@ install: # now just our code
 # don't forget to open up the azure mssql server to these addreses
 # https://docs.travis-ci.com/user/ip-addresses/
 
+#  mariadb: '10.1'
+before_script:
+  - chmod +x ./tests/scripts/mysql_setup.sh
+#  - chmod +x ./tests/scripts/postgres_setup.sh
+  - chmod +x ./tests/scripts/freetds.sh
+  - ./tests/scripts/mysql_setup.sh
+#  - ./tests/scripts/postgres_setup.sh
+  - ./tests/scripts/freetds.sh
+
 # command to run tests
 script:
-
+#  - pythonw -m pytest
   - py.test
 

ODMTools.py

@@ -23,7 +23,7 @@
 import psycopg2
 
 tool = LoggerTool()
-logger = tool.setupLogger(__name__, __name__ + '.log', 'w', logging.DEBUG)
+logger = tool.setupLogger('main',  'odmtools.log', 'a', logging.INFO)
 wx.Log.SetLogLevel(0)
 
 
@@ -67,7 +67,7 @@ def runODM():
     app.MainLoop()
 
 if __name__ == '__main__':
-    logger.debug("Welcome to ODMTools Python. Please wait as system loads")
+    logger.info("Welcome to ODMTools Python. Please wait as system loads")
     # https://docs.python.org/2/library/multiprocessing.html#miscellaneous
 
     # Add support for when a program which uses multiprocessing has been frozen to produce a Windows executable.

README.md

@@ -19,10 +19,10 @@ To make running ODMTools easier we have included installers. Please select the o
 
 ####Windows
 Recommended Release:
-+   [Window v1.2.2-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.2-beta/ODMTools_1.2.2_Beta_Win_Installer.exe)
++   [Window v1.2.5-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.5-beta/ODMTools_1.2.5_Beta_Win_Installer.exe)
 
 ####Mac
-+   [Mac v1.2.2-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.2-beta/ODMTools_v1.2.2-beta_Mac_installer.pkg.zip)
++   [Mac v1.2.5-beta](https://github.com/ODM2/ODMToolsPython/releases/download/v1.2.5-beta/ODMTools_v1.2.5-beta_Mac_installer.pkg.zip)
 
 ####Linux
 +   *Please run from source*

appveyor.yml

@@ -0,0 +1,126 @@
+environment:
+# patterned after: https://github.com/ogrisel/python-appveyor-demo/blob/master/appveyor.yml
+  global:
+    # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
+    # /E:ON and /V:ON options are not enabled in the batch script intepreter
+    # See: http://stackoverflow.com/a/13751649/163740
+    PYTHON: "C:\\conda"
+    MINICONDA_VERSION: "latest"
+    #    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\appveyor\\run_with_env.cmd"
+    CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers/appveyor/windows_sdk.cmd"
+    CONDA_DEPENDENCIES: "numpy matplotlib pandas pymysql scipy sqlite sqlalchemy wxpython pip"
+    PIP_DEPENDENCIES: "geoalchemy pyodbc pytest psycopg2"
+
+
+
+    # postgres
+    POSTGRES_PORT: tcp://localhost:5432
+    POSTGRES_ENV_POSTGRES_USER: postgres
+    POSTGRES_ENV_POSTGRES_PASSWORD: Password12!
+    POSTGRES_ENV_POSTGRES_DB: odm
+    POSTGRES_PATH: C:\Program Files\PostgreSQL\9.4\bin
+    PGUSER: postgres
+    PGPASSWORD: Password12!
+    # mysql
+    MYSQL_PORT: tcp://localhost:3306
+    MYSQL_ENV_MYSQL_USER: root
+    MYSQL_ENV_MYSQL_PASSWORD: Password12!
+    MYSQL_ENV_MYSQL_DATABASE: odm
+    MYSQL_PATH: C:\Program Files\MySql\MySQL Server 5.6\bin
+    MYSQL_PWD: Password12!
+    # sql server
+    SQLSERVER_ENV_SQLSERVER_HOST: localhost
+    SQLSERVER_ENV_SQLSERVER_PORT: 1433
+    SQLSERVER_ENV_SQLSERVER_USER: sa
+    SQLSERVER_ENV_SQLSERVER_PASSWORD: Password12!
+    SQLSERVER_ENV_SQLSERVER_DATABASE: odm
+
+
+
+    # Pre-installed Python versions, which Appveyor may upgrade to
+    # a later point release.
+    # See: http://www.appveyor.com/docs/installed-software#python
+
+  matrix:
+    - PYTHON: "C:\\Python27-conda32"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "32"
+  #        CONDA_PY: "27"
+  #        CONDA_NPY: "18"
+      NUMPY_VERSION: "stable"
+
+    - PYTHON: "C:\\Python27-conda64"
+      PYTHON_VERSION: "2.7"
+      PYTHON_ARCH: "64"
+      NUMPY_VERSION: "stable"
+  #        CONDA_PY: "27"
+  #        CONDA_NPY: "18"
+
+
+  #      - PYTHON: "C:\\Python34-conda64"
+  #        PYTHON_VERSION: "3.4"
+  #        PYTHON_ARCH: "64"
+
+services:
+  - mssql2008r2sp2
+  - mysql
+  - postgresql
+
+install:
+  # If there is a newer build queued for the same PR, cancel this one.
+  # The AppVeyor 'rollout builds' option is supposed to serve the same
+  # purpose but it is problematic because it tends to cancel builds pushed
+  # directly to master instead of just PR builds (or the converse).
+  # credits: JuliaLang developers.
+  - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
+        https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
+        Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
+          throw "There are newer queued builds for this pull request, failing early." }
+  - ECHO "Filesystem root:"
+  - ps: "ls \"C:/\""
+
+  - ECHO "Installed SDKs:"
+  - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
+
+  # Install Python (from the official .msi of http://python.org) and pip when
+  # not already installed.
+#  - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
+  - ps: ci-helpers/appveyor/install-miniconda.ps1
+
+
+  # Prepend newly installed Python to the PATH of this build (this cannot be
+  # done from inside the powershell script as it would require to restart
+  # the parent CMD process).
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  # add databases
+  - "SET PATH=%POSTGRES_PATH%\bin;%MYSQL_PATH%\bin;%PATH%"
+  - "activate test"
+
+  # Check that we have the expected version and architecture for Python
+  - "python --version"
+  - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
+
+
+
+build_script:
+##https://github.com/sqlectron/sqlectron-core/blob/master/appveyor.yml
+
+  # sqlserver
+  - ps: ci-helpers\appveyor\sqlserver.ps1 SQL2008R2SP2
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "CREATE DATABASE odm" -d "master"
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -i tests\data\sampledb\odm_mssql.sql -d "odm"
+  - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "select table_name from information_schema.tables" -d "odm"
+#  # postgres
+#  - psql createdb odm
+#  - psql -d odm -a -f tests\data\sampledb\odm_postgres.sql
+#  # mysql
+#  - mysql -e "drop database test; create database odm;" --user=root
+#  - mysql odm < tests\data\sampledb\odm_mysql.sql --user=root
+
+test_script:
+  # Run the project tests
+  - "py.test"
+
+
+
+