Merging commits to get travis with macOS running into one.

.travis.yml

@@ -1,24 +1,19 @@
-language: python
+language: c
 sudo: true
-services:
-  - postgresql
-addons:
-  apt:
-    packages:
-    - samtools
-python:
-  - 2.7
-  - 3.5
-  - 3.6
 
+env:
+  - TRAVIS_PYTHON_VERSION=2.7
+  - TRAVIS_PYTHON_VERSION=3.6
 os:
   - linux
+  - osx
 
 jobs:
   include:
     - stage: lint
       env:
         - LINT=1
+        - TRAVIS_PYTHON_VERSION=2.7
       before_install:
         - curl https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -o miniconda.sh
         - bash miniconda.sh -b -p $HOME/miniconda
@@ -37,8 +32,9 @@ before_install:
   - export HIC_TEST_DATA_DIR="`pwd`/hicexplorer/test/test_data/"
   - echo $HIC_TEST_DATA_DIR
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then curl https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -o miniconda.sh ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PYTHON_VERSION" == "3.5" ]]; then curl https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh ; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then curl https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -o miniconda.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then curl https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -o miniconda.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then curl https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o miniconda.sh ; fi
   - bash miniconda.sh -b -p $HOME/miniconda
   - PATH_WITHOUT_CONDA="$PATH"
   - export PATH="$HOME/miniconda/bin:$PATH"
@@ -53,7 +49,7 @@ install:
   - conda create --name hicexplorer_pytest --yes python=$TRAVIS_PYTHON_VERSION pytest
   - source activate hicexplorer_pytest
   - conda install --yes -c defaults -c conda-forge -c bioconda --file requirements.txt
-  - conda install --yes -c defaults -c conda-forge -c bioconda configparser
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then conda install --yes -c defaults -c conda-forge -c bioconda configparser ; fi
   - python setup.py install
 
 # command to run tests