Merge pull request #148 from ocefpaf/use_conda-forge

use conda-forge

Author: emiliom

.travis.yml

@@ -60,7 +60,6 @@ before_install:
   - conda config --set always_yes yes --set changeps1 no --set show_channel_urls true
   - conda update conda
   - conda config --add channels conda-forge --force
-  - conda config --add channels odm2 --force
   - conda create --name TEST python=$TRAVIS_PYTHON_VERSION --file requirements.txt --file requirements-dev.txt
   - source activate TEST
 

appveyor.yml

@@ -8,7 +8,7 @@ environment:
     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_CHANNELS: "odm2"
+    CONDA_CHANNELS: "conda-forge"
     CONDA_DEPENDENCIES: "scipy pandas seaborn sqlalchemy pymysql geoalchemy-odm2 shapely psycopg2"
     PIP_DEPENDENCIES: "pyodbc,pytest"
     #,-e git+https://github.com/ODM2/[email protected]#egg=geoalchemy-0.7.4"