update travis and appveyor files

Author: stephanie

.travis.yml

@@ -38,8 +38,8 @@ addons:
       - libspatialite-dev
 #  mariadb: '10.1'
 before_script:
-  - ./ci-helpers/travis/mysql_setup.sh
-  - ./ci-helpers/travis/postgres_setup.sh
+  - ./ci-helpers/mysql_setup.sh
+  - ./ci-helpers/postgres_setup.sh
   - ./ci-helpers/travis/freetds.sh
 
 

appveyor.yml

@@ -22,15 +22,15 @@ environment:
     POSTGRES_ENV_POSTGRES_USER: postgres
     POSTGRES_ENV_POSTGRES_PASSWORD: Password12!
     POSTGRES_ENV_POSTGRES_DB: odm2
-    POSTGRES_PATH: C:\Program Files\PostgreSQL\9.4\bin
+    POSTGRES_PATH: C:\\Program Files\\PostgreSQL\\9.4
     PGUSER: postgres
     PGPASSWORD: Password12!
     # mysql
     MYSQL_PORT: tcp://localhost:3306
     MYSQL_ENV_MYSQL_USER: root
     MYSQL_ENV_MYSQL_PASSWORD: Password12!
     MYSQL_ENV_MYSQL_DATABASE: odm2
-    MYSQL_PATH: C:\Program Files\MySql\MySQL Server 5.6\bin
+    MYSQL_PATH: C:\\Program Files\\MySql\\MySQL Server 5.6
     MYSQL_PWD: Password12!
     # sql server
     SQLSERVER_ENV_SQLSERVER_HOST: localhost
@@ -100,18 +100,24 @@ install:
 
 build_script:
 ##https://github.com/sqlectron/sqlectron-core/blob/master/appveyor.yml
+  - echo %PATH%
+
+  # postgres
+  - ./ci-helpers/postgres_setup.sh
+#  - psql createdb marchantariats
+#  - psql -d marchantariats -a -f tests/usecasesql/marchantariats/marchantariats.sql
+
+
+  # mysql
+  - ./ci-helpers/mysql_setup.sh
+#  - mysql -e "drop database test; create database odm2;" --user=root
+#  - mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
 
   # sqlserver
   - ps: ci-helpers\appveyor\sqlserver.ps1 SQL2008R2SP2
   - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "CREATE DATABASE odm2" -d "master"
   - sqlcmd -S localhost,1433 -U sa -P Password12! -i tests/usecasesql/littlebearriver/sampledatabases/odm2_ms_sql_server/LBR_ODM2_MSSQLDump.sql -d "odm2"
   - sqlcmd -S localhost,1433 -U sa -P Password12! -Q "select table_name from information_schema.tables" -d "odm2"
-  # postgres
-  - psql createdb marchantariats
-  - psql -d marchantariats -a -f tests/usecasesql/marchantariats/marchantariats.sql
-  # mysql
-  - mysql -e "drop database test; create database odm2;" --user=root
-  - mysql odm2 < tests/usecasesql/littlebearriver/sampledatabases/odm2_mysql/LBR_MySQL_SmallExample.sql --user=root
 
 test_script:
   # Run the project tests

ci-helpers/travis/mysql_setup.sh ci-helpers/mysql_setup.shci-helpers/travis/mysql_setup.sh renamed to ci-helpers/mysql_setup.sh

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

ci-helpers/travis/postgres_setup.sh ci-helpers/postgres_setup.shci-helpers/travis/postgres_setup.sh renamed to ci-helpers/postgres_setup.sh

@@ -4,11 +4,12 @@ pytest-cov
 mock
 #db support
 pymysql
-#pymssql
-psycopg2
 #pysqlite
 #sqlite
+pymssql
+psycopg2
 #pyspatialite
 #mysql-python
 
 
+