diff --git a/.travis.yml b/.travis.yml index eaa8e8b..680088e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,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 diff --git a/README.md b/README.md index 3baeb11..19ec59c 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ A Python-based application programmer's interface for the [List of current and planned functions included in the API](https://github.com/ODM2/ODM2PythonAPI/blob/master/doc/APIFunctionList.md) +## Documentation + +For the latest documentation of the ODM2 Python API, see [http://odm2.github.io/ODM2PythonAPI/](http://odm2.github.io/ODM2PythonAPI/) + ## Installation The easiest and most reliable way to install the ODM2 Python API (`odm2api`) is using the diff --git a/appveyor.yml b/appveyor.yml index b34a56c..1c23c58 100644 --- a/appveyor.yml +++ b/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/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4" diff --git a/requirements-dev.txt b/requirements-dev.txt index 71bb791..2287a7a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,6 +14,7 @@ pymysql pytest pytest-cov sphinx +ipython # FIXME: I am not sure these are needed. # pysqlite # sqlite