update testing scripts

Author: stephanie

.travis.yml

@@ -42,6 +42,7 @@ before_script:
   - ./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

appveyor.yml

@@ -9,7 +9,8 @@ environment:
     #    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: "scipy pandas seaborn sqlalchemy pymysql "
-    PIP_DEPENDENCIES: "shapely,pyodbc,pytest,psycopg2,-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
+    PIP_DEPENDENCIES: "shapely,pyodbc,pytest,psycopg2"
+    #,-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
 
 
 

ci-helpers/appveyor/install-miniconda.ps1

@@ -168,6 +168,10 @@ if ($env:ASTROPY_VERSION -match "dev") {
    Invoke-Expression "${env:CMD_IN_ENV} pip install git+https://github.com/astropy/astropy.git#egg=astropy --upgrade --no-deps"
 }
 
+Invoke-Expression "${env:CMD_IN_ENV} pip install -e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4"
+
+
+
 # We finally install the dependencies listed in PIP_DEPENDENCIES. We do this
 # after installing the Numpy versions of Numpy or Astropy. If we didn't do this,
 # then calling pip earlier could result in the stable version of astropy getting

requirements.txt

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

requirements_tests.txt

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