Merge pull request #180 from bsipocz/travis_fix_miniconda_path

Fixing miniconda path in .travis.xml and updating helpers

.gitignore

@@ -12,3 +12,4 @@ wcsaxes/version.py
 .settings
 .idea
 .coverage
+*/cython_version.py

.travis.yml

@@ -12,22 +12,22 @@ addons:
             - dvipng
 
 python:
-    - 2.6
     - 2.7
-    - 3.3
     - 3.4
-    # This is just for "egg_info".  All other builds are explicitly given in the matrix
+    - 3.5
+
 env:
     global:
         # The following versions are the 'default' for tests, unless
         # overidden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
-        - NUMPY_VERSION=1.9
+        - NUMPY_VERSION=stable
         - ASTROPY_VERSION=stable
-        - CONDA_INSTALL='conda install -c astropy-ci-extras --yes'
-        - PIP_INSTALL='pip install'
+        - CONDA_DEPENDENCIES='pyqt nose matplotlib=1.4.3 pillow'
+        - PIP_DEPENDENCIES='pytest-mpl'
     matrix:
         - SETUP_CMD='egg_info'
+        - SETUP_CMD='test --remote-data'
 
 matrix:
     include:
@@ -41,23 +41,23 @@ matrix:
         - python: 2.7
           env: SETUP_CMD='build_sphinx -w'
 
-        # Try Astropy development version
+        # Try Astropy development and LTS versions
         - python: 2.7
           env: ASTROPY_VERSION=development SETUP_CMD='test --remote-data'
-        - python: 3.3
+        - python: 3.5
           env: ASTROPY_VERSION=development SETUP_CMD='test --remote-data'
+        - python: 2.7
+          env: ASTROPY_VERSION=lts SETUP_CMD='test --remote-data'
+        - python: 3.5
+          env: ASTROPY_VERSION=lts SETUP_CMD='test --remote-data'
 
         # Try all python versions with the latest numpy
-        - python: 2.6
-          env: SETUP_CMD='test --remote-data'
-        - python: 2.7
-          env: SETUP_CMD='test --remote-data'
         - python: 3.3
-          env: SETUP_CMD='test --remote-data'
-        - python: 3.4
-          env: SETUP_CMD='test --remote-data'
+          env: SETUP_CMD='test --remote-data' NUMPY_VERSION=1.9
 
         # Try older numpy versions
+        - python: 2.7
+          env: NUMPY_VERSION=1.9 SETUP_CMD='test --remote-data'
         - python: 2.7
           env: NUMPY_VERSION=1.8 SETUP_CMD='test --remote-data'
         - python: 2.7
@@ -67,15 +67,6 @@ matrix:
 
 before_install:
 
-    # Use utf8 encoding. Should be default, but this is insurance against
-    # future changes
-    - export PYTHONIOENCODING=UTF8
-    - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
-    - chmod +x miniconda.sh
-    - ./miniconda.sh -b
-    - export PATH=/home/travis/miniconda/bin:$PATH
-    - conda update --yes conda
-
     # Make sure that interactive matplotlib backends work
     - export DISPLAY=:99.0
     - sh -e /etc/init.d/xvfb start
@@ -84,41 +75,13 @@ before_install:
     - export QT_API=pyqt
 
 install:
-
-    # CONDA
-    - conda create --yes -n test -c astropy-ci-extras python=$TRAVIS_PYTHON_VERSION
-    - source activate test
-
-    # CORE DEPENDENCIES
-    - if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION pytest pip Cython jinja2; fi
-    - if [[ $SETUP_CMD != egg_info ]]; then $PIP_INSTALL pytest-xdist; fi
-
-    # ASTROPY
-    - if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == development ]]; then $PIP_INSTALL git+http://github.com/astropy/astropy.git#egg=astropy; fi
-    - if [[ $SETUP_CMD != egg_info ]] && [[ $ASTROPY_VERSION == stable ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION astropy; fi
-
-    # OPTIONAL DEPENDENCIES
-    # Here you can add any dependencies your package may have. You can use
-    # conda for packages available through conda, or pip for any other
-    # packages. You should leave the `numpy=$NUMPY_VERSION` in the `conda`
-    # install since this ensures Numpy does not get automatically upgraded.
-    - if [[ $SETUP_CMD != egg_info ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION nose pyqt matplotlib pillow; fi
-    - if [[ $SETUP_CMD != egg_info ]]; then $PIP_INSTALL pytest-mpl; fi
-
-    # DOCUMENTATION DEPENDENCIES
-    # build_sphinx needs sphinx and matplotlib (for plot_directive). Note that
-    # this matplotlib will *not* work with py 3.x, but our sphinx build is
-    # currently 2.7, so that's fine
-    - if [[ $SETUP_CMD == build_sphinx* ]]; then $CONDA_INSTALL numpy=$NUMPY_VERSION Sphinx sphinx_rtd_theme matplotlib; fi
-
-    # COVERAGE DEPENDENCIES
-    - if [[ $SETUP_CMD == 'test --coverage --remote-data' ]]; then $PIP_INSTALL coverage==3.7.1 coveralls; fi
+    - git clone git://github.com/astropy/ci-helpers.git
+    - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
 
 script:
     - python setup.py $SETUP_CMD
 
 after_success:
-    # If coveralls.io is set up for this package, uncomment the line
-    # below and replace "packagename" with the name of your package.
-    # The coveragerc file may be customized as needed for your package.
-    - if [[ $SETUP_CMD == 'test --coverage --remote-data' ]]; then coveralls --rcfile='wcsaxes/tests/coveragerc'; fi
+    - if [[ $SETUP_CMD == 'test --coverage --remote-data' ]]; then
+          coveralls --rcfile='wcsaxes/tests/coveragerc';
+      fi

CHANGES.md

@@ -1,6 +1,8 @@
 0.7 (unreleased)
 ----------------
 
+- Removed support for python 2.6.
+
 - Use wcs_to_celestial from Astropy. Astropy >= 1.0 is now required for
   WCSAxes. [#176]
 
@@ -43,7 +45,7 @@
 0.3 (2014-12-07)
 ----------------
 
-- Fixed a bug that caused axis labels to be incorrectly placed when hiding tick 
+- Fixed a bug that caused axis labels to be incorrectly placed when hiding tick
   labels using ``set_visible(False)``. [#111]
 
 - Fixed a bug that caused tick labels to not always appear. [#110]