Add test for conda master to travis

conda · Dec 15, 2016 · dd9a94a · dd9a94a
1 parent dd25642
commit dd9a94a
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,22 +5,34 @@ matrix:
       os: linux
     - python: '3.5'
       os: linux
-    # - python: '3.5'
-    #   env: CANARY=true
-    #   os: linux
+#    - python: '3.5'
+#      env: CANARY=true
+#      os: linux
     - python: '3.5'
       env: CONDA=4.1
       os: linux
     - python: '3.5'
       env:
         - FLAKE8=true
       os: linux
+    - python: '3.5'
+      env: CONDA_MASTER=true
+      os: linux
 
 install:
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+  - if [[ "$CONDA_MASTER" == "true" ]]; then
+      git clone https://github.com/conda/conda.git;
+      pushd conda;
+      python setup.py install;
+      hash -r;
+      conda info;
+      popd;
     else
-      wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+      if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+        wget http://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+      else
+        wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+      fi
     fi
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"