changes from review

Author: bobhaffner

.travis.yml

@@ -49,10 +49,9 @@ matrix:
         apt:
           packages:
           - python-gtk2
-    # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+        - JOB="3.6_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow --skip-network" CONDA_BUILD_TEST=true
     - dist: trusty
       env:
         - JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
@@ -63,7 +62,7 @@ matrix:
     # In allow_failures
     - dist: trusty
       env:
-        - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+        - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
       addons:
         apt:
           packages:
@@ -82,10 +81,7 @@ matrix:
           - JOB="2.7_SLOW" SLOW=true
       - dist: trusty
         env:
-        - JOB="3.6_CONDA_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
-      - dist: trusty
-        env:
-          - JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
+          - JOB="3.6_PIP_BUILD_TEST" TEST_ARGS="--skip-slow" PIP_BUILD_TEST=true
         addons:
           apt:
             packages:

ci/install_travis.sh

@@ -116,7 +116,7 @@ if [ "$COVERAGE" ]; then
 fi
 
 echo
-if [ -z "$BUILD_TEST" ]; then
+if [ -z "$PIP_BUILD_TEST" ] || [ -z "$CONDA_BUILD_TEST" ]; then
 
     # build but don't install
     echo "[build em]"
@@ -155,7 +155,7 @@ echo "[removing installed pandas]"
 conda remove pandas -y --force
 pip uninstall -y pandas
 
-if [ "$BUILD_TEST" ]; then
+if [ "$PIP_BUILD_TEST" ]; then
 
     # remove any installation
     pip uninstall -y pandas
@@ -167,6 +167,10 @@ if [ "$BUILD_TEST" ]; then
     bash scripts/build_dist_for_release.sh
     conda uninstall -y cython
     time pip install dist/*tar.gz || exit 1
+    
+elif [ "$CONDA_BUILD_TEST" ]; then
+
+    conda build ./conda.recipe/ --numpy 1.11 --python 3.6 -q
 
 else
 

ci/requirements-3.6_CONDA_BUILD_TEST.sh

@@ -4,6 +4,4 @@ source activate pandas
 
 echo "install 36 CONDA_BUILD_TEST"
 
-conda install conda-build
-
-conda build ./conda.recipe/ --numpy 1.11 --python 3.6 -q
+conda install conda-build