Add travis test for OSX and Native Linux.

Test for Python 2.6, 2.7 with Anaconda and native Linux packages.

Author: pavoljuhas

.travis.yml

@@ -1,41 +1,92 @@
 # Use container-based travis workers
 sudo: false
 
-language: python
+language: generic
 
-python:
-  - 2.6
-  - 2.7
-# - 3.3
-# - 3.4
-# - "3.5.0b4"
+os:
+  - linux
+  - osx
+
+env:
+  - MYUSEMC=true MYPYTHON_VERSION=2.6
+  - MYUSEMC=true MYPYTHON_VERSION=2.7
+  - MYUSEMC=false MYPYTHON_VERSION=2.6
+  - MYUSEMC=false MYPYTHON_VERSION=2.7
+
+matrix:
+  exclude:
+    - os: osx
+      env: MYUSEMC=false MYPYTHON_VERSION=2.6
+    - os: osx
+      env: MYUSEMC=false MYPYTHON_VERSION=2.7
 
 branches:
   except:
     - /^v[0-9]/
 
+addons:
+  apt:
+    packages:
+    - python-numpy
+    - python-setuptools
+
 before_install:
+  - umask 022
+  - git fetch origin --unshallow --tags
+  - if ${MYUSEMC}; then
+        NOAPT=true; NOMC=false;
+    else
+        NOAPT=false; NOMC=true;
+        MYPIPFLAGS="--user";
+    fi
   - MYMCREPO=https://repo.continuum.io/miniconda
-  - MYMCBUNDLE=Miniconda-latest-Linux-x86_64.sh
+  - case ${TRAVIS_OS_NAME} in
+    linux)
+        MYMCBUNDLE=Miniconda-latest-Linux-x86_64.sh ;;
+    osx)
+        MYMCBUNDLE=Miniconda-latest-MacOSX-x86_64.sh ;;
+    *)
+        echo "Unsupported operating system." >&2
+        exit 2 ;;
+    esac
+
   - mkdir -p ~/pkgs/
-  - pushd ~/pkgs/
-  - wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
-  - test -x ~/mc/bin/conda || bash ${MYMCBUNDLE} -b -f -p ~/mc
-  - export PATH="${HOME}/mc/bin:${PATH}"
-  - conda update conda --yes
-  - conda remove --name=testenv --yes --offline --all
-  - conda create --name=testenv --yes
-      python=$TRAVIS_PYTHON_VERSION pip setuptools numpy coverage
-  - source activate testenv
-  - popd
+
+  - $NOMC || pushd ~/pkgs/
+  - $NOMC || wget --timestamping ${MYMCREPO}/${MYMCBUNDLE}
+  - $NOMC || test -x ~/mc/bin/conda || bash ${MYMCBUNDLE} -b -f -p ~/mc
+  - $NOMC || popd
+  - $NOMC || export PATH="${HOME}/mc/bin:${PATH}"
+  - $NOMC || conda update --yes conda
+  - $NOMC || conda install --yes conda-build jinja2
+  - $NOMC || conda create --name=testenv --yes python=${MYPYTHON_VERSION} coverage
+
+  - $NOAPT || test "${TRAVIS_OS_NAME}" = "linux" || exit $?
+  - $NOAPT || devutils/makesdist
+  - $NOAPT || MYTARBUNDLE="$(ls -t "${PWD}"/dist/*.tar.gz | head -1)"
 
 install:
-  - git fetch origin --tags
-  - python setup.py install
+  - $NOMC || CONDA_PY=${MYPYTHON_VERSION} conda build conda-recipe
+  - $NOMC || conda list --name=_test --export diffpy.utils > /tmp/mypackage.txt
+  - $NOMC || source activate testenv
+  - $NOMC || conda install --yes --use-local --file=/tmp/mypackage.txt
+
+  - $NOAPT || pip install $MYPIPFLAGS coverage
+  - $NOAPT || easy_install --user "${MYTARBUNDLE}"
+
+  - cd
+  - MYGIT_REV=$(python -c "import diffpy.utils.version as v; print(v.__gitsha__)")
+  - if [[ "${TRAVIS_COMMIT}" != "${MYGIT_REV}" ]]; then
+        echo "Version mismatch ${TRAVIS_COMMIT} vs ${MYGIT_REV}.";
+        exit 1;
+    fi
 
 script:
   - coverage run --source diffpy.utils -m diffpy.utils.tests.run
 
 after_success:
-  - pip install codecov
+  - pip install $MYPIPFLAGS codecov
+  - $NOMC || if [[ "${MYPYTHON_VERSION}" == 2.6 ]]; then
+        conda install --yes argparse;
+    fi
   - codecov