Merge pull request #206 from astrofrog/use-ci-helpers

Use ci-helpers
Conflicts:
	.travis.yml
	continuous-integration/travis/install_conda_linux.sh
	continuous-integration/travis/install_conda_osx.sh

.travis.yml

@@ -14,35 +14,30 @@ env:
     - PYTHON_VERSION=3.3
     - PYTHON_VERSION=3.4
   global:
-      - SETUPTOOLS_VERSION=stable
+    - SETUPTOOLS_VERSION=stable
+    - CONDA_DEPENDENCIES="pytest sphinx cython numpy"
+    - PIP_DEPENDENCIES="coveralls pytest-cov"
 
 matrix:
     include:
         - os: linux
           env: PYTHON_VERSION=2.7 SETUPTOOLS_VERSION=dev
+               CONDA_DEPENDENCIES="pytest sphinx cython numpy mercurial mock"
 
 before_install:
 
-    # Use utf8 encoding. Should be default, but this is insurance against
-    # future changes
-    - export PYTHONIOENCODING=UTF8
+    - if [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get update; sudo apt-get install graphviz; fi
+    - if [[ $TRAVIS_OS_NAME == osx ]]; then brew update; brew install graphviz; fi
 
-    # Install conda
-    - source continuous-integration/travis/install_conda_$TRAVIS_OS_NAME.sh
+install:
 
-    # Install graphviz
-    - source continuous-integration/travis/install_graphviz_$TRAVIS_OS_NAME.sh
+    - git clone git://github.com/astropy/ci-helpers.git
+    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
 
-install:
-    - conda create --yes -n test python=$PYTHON_VERSION
-    - source activate test
-    - conda install --yes pip "pytest<2.6" sphinx cython numpy
-    - pip install coveralls pytest-cov
     # We cannot install the developer version of setuptools using pip because
     # pip tries to remove the previous version of setuptools before the
     # installation is complete, which causes issues. Instead, we just install
     # setuptools manually.
-    - if [[ $SETUPTOOLS_VERSION == dev ]]; then conda install --yes mercurial mock; fi
     - if [[ $SETUPTOOLS_VERSION == dev ]]; then hg clone https://bitbucket.org/pypa/setuptools; cd setuptools; python setup.py install; cd ..; fi
 
 before_script:

appveyor.yml

@@ -6,10 +6,11 @@ environment:
   global:
       PYTHON: "C:\\conda"
       MINICONDA_VERSION: "3.5.5"
-      CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\continuous-integration\\appveyor\\windows_sdk.cmd"
+      CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd"
       PYTHON_ARCH: "64" # needs to be set for CMD_IN_ENV to succeed. If a mix
                         # of 32 bit and 64 bit builds are needed, move this
                         # to the matrix section.
+      CONDA_DEPENDENCIES: "numpy Cython sphinx pytest"
 
   matrix:
       - PYTHON_VERSION: "2.6"
@@ -20,23 +21,13 @@ platform:
     -x64
 
 install:
-    # Install miniconda using a powershell script.
-    - "powershell continuous-integration/appveyor/install-miniconda.ps1"
-    - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
-
-    # Install the build and runtime dependencies of the project.
-    - "conda update --yes conda"
 
-    # Create a conda environment
-    - "conda create -q --yes -n test python=%PYTHON_VERSION%"
+    # Set up ci-helpers
+    - "git clone git://github.com/astropy/ci-helpers.git"
+    - "powershell ci-helpers/appveyor/install-miniconda.ps1"
+    - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
     - "activate test"
 
-    # Check that we have the expected version of Python
-    - "python --version"
-
-    # Install specified version of numpy and dependencies
-    - "conda install -q --yes numpy Cython sphinx pytest"
-
     # Some of the tests use git commands that require a user to be configured
     - git config --global user.name "A U Thor"
     - git config --global user.email "author@example.com"