pandas-dev · jreback · Nov 25, 2018 · Nov 22, 2018 · Nov 22, 2018 · Nov 22, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -104,6 +104,7 @@ before_script:
   - ci/before_script_travis.sh
 
 script:
+  - source activate pandas-dev
   - echo "script start"
   - ci/run_build_docs.sh
   - ci/script_single.sh
@@ -115,7 +116,7 @@ after_success:
 
 after_script:
   - echo "after_script start"
-  - source activate pandas && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
+  - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd
   - if [ -e test-data-single.xml ]; then
     ci/print_skipped.py test-data-single.xml;
     fi

diff --git a/ci/build_docs.sh b/ci/build_docs.sh
@@ -12,8 +12,6 @@ if [ "$DOC" ]; then
 
     echo "Will build docs"
 
-    source activate pandas
-
     echo ###############################
     echo # Log file for the doc build  #
     echo ###############################

diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
 dependencies:

diff --git a/ci/deps/azure-windows-27.yaml b/ci/deps/azure-windows-27.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/circle-36-locale.yaml b/ci/deps/circle-36-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-27-locale.yaml b/ci/deps/travis-27-locale.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-27.yaml b/ci/deps/travis-27.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36-doc.yaml b/ci/deps/travis-36-doc.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-36.yaml b/ci/deps/travis-36.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/deps/travis-37-numpydev.yaml b/ci/deps/travis-37-numpydev.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
 dependencies:

diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml
@@ -1,4 +1,4 @@
-name: pandas
+name: pandas-dev
 channels:
   - defaults
   - conda-forge

diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd
@@ -1,5 +1,5 @@
 @rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd
-call activate %CONDA_ENV%
+
 
 @rem Build numba extensions without silencing compile errors
 python setup.py build_ext -q --inplace

diff --git a/ci/incremental/build.sh b/ci/incremental/build.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source activate $CONDA_ENV
 
 # Make sure any error below is reported as such
 set -v -e

diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd
@@ -11,11 +11,10 @@ call deactivate
 @rem Display root environment (for debugging)
 conda list
 @rem Clean up any left-over from a previous build
-conda remove --all -q -y -n %CONDA_ENV%
+conda remove -all -q -y -n pandas-dev
 @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite
-conda env create -n %CONDA_ENV% --file=ci\deps\azure-windows-%CONDA_PY%.yaml
+conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml
 
-call activate %CONDA_ENV%
 conda list
 
 if %errorlevel% neq 0 exit /b %errorlevel%
diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh
@@ -5,23 +5,20 @@ set -v -e
 CONDA_INSTALL="conda install -q -y"
 PIP_INSTALL="pip install -q"
 
+
 # Deactivate any environment
 source deactivate
 # Display root environment (for debugging)
 conda list
 # Clean up any left-over from a previous build
 # (note workaround for https://github.com/conda/conda/issues/2679:
 #  `conda env remove` issue)
-conda remove --all -q -y -n $CONDA_ENV
+conda remove --all -q -y -n pandas-dev
 
 echo
 echo "[create env]"
-time conda env create -q -n "${CONDA_ENV}" --file="${ENV_FILE}" || exit 1
+time conda env create -q --file="${ENV_FILE}" || exit 1
 
-# Activate first
-set +v
-source activate $CONDA_ENV
-set -v
 
 # remove any installed pandas package
 # w/o removing anything else

diff --git a/ci/script_single.sh b/ci/script_single.sh
@@ -2,7 +2,6 @@
 
 echo "[script_single]"
 
-source activate pandas
 
 if [ -n "$LOCALE_OVERRIDE" ]; then
     echo "Setting LC_ALL and LANG to $LOCALE_OVERRIDE"

diff --git a/ci/upload_coverage.sh b/ci/upload_coverage.sh
@@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then
    exit 0
 fi
 
-source activate pandas
 
 echo "uploading coverage"
 bash <(curl -s https://codecov.io/bash) -Z -c -F single -f /tmp/cov-single.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ if [ -z "$COVERAGE" ]; then @@
        exit 0
     fi
-    source activate pandas
     echo "uploading coverage"
     bash <(curl -s https://codecov.io/bash) -Z -c -F single -f /tmp/cov-single.xml
@@ Expand Down @@