update travis script paths

Author: stephanie

.travis.yml

@@ -38,17 +38,17 @@ addons:
       - libspatialite-dev
 #  mariadb: '10.1'
 before_script:
-  - ./scripts/mysql_setup.sh
-  - ./scripts/postgres_setup.sh
-  - ./scripts/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 git+https://github.com/ODM2/geoalchemy.git@odm2#egg=geoalchemy-0.7.3
+  - pip install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
   - pip install   .
   - pip install  -r requirements_tests.txt  --allow-external pyodbc --allow-unverified pyodbc
     # pysqlite

appveyor.yml

@@ -100,16 +100,16 @@ 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 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"
+#  - 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 odm2
 #  - psql -d odm2 -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
+  # 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

requirements.txt

@@ -1,5 +1,5 @@
 pyodbc
-six
+#six
 sqlalchemy
 -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
 shapely