From 88bc2b72bc5dfa20950fb7633cd1ce9566bae252 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 16:40:32 +0100 Subject: [PATCH 01/36] change pandas to pandas-dev --- ci/deps/azure-27-compat.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/azure-windows-27.yaml | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/circle-36-locale.yaml | 2 +- ci/deps/travis-27-locale.yaml | 2 +- ci/deps/travis-27.yaml | 2 +- ci/deps/travis-36-doc.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-36.yaml | 2 +- ci/deps/travis-37-numpydev.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml index 44c561e9c8911..f3cc615c35243 100644 --- 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 index 7e40bd1a9979e..4bbc6a2c11f1e 100644 --- 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 index 59c8818eaef1e..2b38465c04512 100644 --- 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 index 6ccdc79d11b27..7a0c3b81ac8f9 100644 --- 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 index dc68129a5e6d3..b1533b071fa74 100644 --- 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 index af42545af7971..817aab66c65aa 100644 --- 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 index 59c8818eaef1e..2b38465c04512 100644 --- 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 index c8d17cf190e35..0846ef5e8264e 100644 --- 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 index 5a9e206ec2c69..8d14673ebde6d 100644 --- 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 index fb54c784d6fac..ed0764fab414a 100644 --- 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 index 3157ecac3a902..a6ffdb95e5e7c 100644 --- 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 index 1880fa2501581..1781f67041f44 100644 --- 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 index 82c75b7c91b1f..99ae228f25de3 100644 --- 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 index 7dbd85ac27df6..a297786f6b14d 100644 --- 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 From fc88e2b45889a7b4c4d36a2a0bcdc86dd880a5d7 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:48:15 +0100 Subject: [PATCH 02/36] add source activate --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d31adcbf8a43..9c98286f4c20f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,6 +104,7 @@ before_script: - ci/before_script_travis.sh script: + - source activate $CONDA_ENV - echo "script start" - ci/run_build_docs.sh - ci/script_single.sh From fb34dcc287cb27b50c9b573c3fec44763ad73495 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:49:17 +0100 Subject: [PATCH 03/36] remove source activate --- ci/build_docs.sh | 2 -- ci/incremental/build.sh | 1 - ci/incremental/setup_conda_environment.cmd | 4 ++-- ci/incremental/setup_conda_environment.sh | 5 ++--- ci/script_single.sh | 1 - ci/upload_coverage.sh | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 33340a1c038dc..f89c4369dff4a 100755 --- 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/incremental/build.sh b/ci/incremental/build.sh index 8f2301a3b7ef5..40f78e7d95d52 100755 --- 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 index 35595ffb03695..bd628f3147b79 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,9 +11,9 @@ 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 @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 diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index f3ac99d5e7c5a..559a9e8b802b3 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -12,15 +12,14 @@ 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 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 diff --git a/ci/script_single.sh b/ci/script_single.sh index ea0d48bc2da8a..b57b643290c73 100755 --- 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 index a7ef2fa908079..88aca20590505 100755 --- 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 From 04e721cc55f0b5e4fd9dcde86ec2eb107d97f007 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:53:52 +0100 Subject: [PATCH 04/36] clean the script --- .travis.yml | 2 +- ci/incremental/build.cmd | 2 +- ci/incremental/setup_conda_environment.cmd | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c98286f4c20f..bec92204e393d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ before_script: - ci/before_script_travis.sh script: - - source activate $CONDA_ENV + - source activate pandas-dev - echo "script start" - ci/run_build_docs.sh - ci/script_single.sh diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd index d2fd06d7d9e50..7115dea8c7eac 100644 --- 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/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index bd628f3147b79..b084e45fa3db7 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -15,7 +15,6 @@ conda remove --all -q -y @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml -call activate %CONDA_ENV% conda list if %errorlevel% neq 0 exit /b %errorlevel% From cd81131b671a8c63c55f6d557294f1dbbfeac38b Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 23:12:42 +0100 Subject: [PATCH 05/36] debug --- ci/incremental/setup_conda_environment.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index b084e45fa3db7..6c1a484b2d2ef 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,7 +11,7 @@ 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 + @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml From 463be05f4e04b8f9c7d953f9648adcf932f478cd Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 23:35:49 +0100 Subject: [PATCH 06/36] debug --- .travis.yml | 2 +- ci/incremental/setup_conda_environment.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bec92204e393d..cd341a0af0c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,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/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 559a9e8b802b3..6875db39125df 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -20,6 +20,7 @@ time conda env create -q --file="${ENV_FILE}" || exit 1 # Activate first set +v +source activate pandas-dev set -v # remove any installed pandas package From 6efdedd8ed4de2a0ea66ea8b0944b61f6f96b53b Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 08:43:33 +0100 Subject: [PATCH 07/36] add pandas-dev back at two lines --- ci/incremental/setup_conda_environment.cmd | 2 +- ci/incremental/setup_conda_environment.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 6c1a484b2d2ef..e44e62cf42442 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,7 +11,7 @@ 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 pandas-dev @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 6875db39125df..e2562626aea50 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -12,16 +12,12 @@ 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 +conda remove --all -q -y -n pandas-dev echo echo "[create env]" time conda env create -q --file="${ENV_FILE}" || exit 1 -# Activate first -set +v -source activate pandas-dev -set -v # remove any installed pandas package # w/o removing anything else From 24bc4f64a4b57c6279d64b0a6d5dab0f895fbe96 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 16:40:32 +0100 Subject: [PATCH 08/36] change pandas to pandas-dev --- ci/deps/azure-27-compat.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/azure-windows-27.yaml | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/circle-36-locale.yaml | 2 +- ci/deps/travis-27-locale.yaml | 2 +- ci/deps/travis-27.yaml | 2 +- ci/deps/travis-36-doc.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-36.yaml | 2 +- ci/deps/travis-37-numpydev.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ci/deps/azure-27-compat.yaml b/ci/deps/azure-27-compat.yaml index 44c561e9c8911..f3cc615c35243 100644 --- 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 index 7e40bd1a9979e..4bbc6a2c11f1e 100644 --- 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 index 59c8818eaef1e..2b38465c04512 100644 --- 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 index 6ccdc79d11b27..7a0c3b81ac8f9 100644 --- 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 index dc68129a5e6d3..b1533b071fa74 100644 --- 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 index af42545af7971..817aab66c65aa 100644 --- 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 index 59c8818eaef1e..2b38465c04512 100644 --- 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 index c8d17cf190e35..0846ef5e8264e 100644 --- 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 index 5a9e206ec2c69..8d14673ebde6d 100644 --- 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 index fb54c784d6fac..ed0764fab414a 100644 --- 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 index 3157ecac3a902..a6ffdb95e5e7c 100644 --- 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 index 1880fa2501581..1781f67041f44 100644 --- 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 index 82c75b7c91b1f..99ae228f25de3 100644 --- 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 index 7dbd85ac27df6..a297786f6b14d 100644 --- 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 From 28a3ebf6e21163301d98d506047ca2bfab88b851 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:48:15 +0100 Subject: [PATCH 09/36] add source activate --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d31adcbf8a43..9c98286f4c20f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,6 +104,7 @@ before_script: - ci/before_script_travis.sh script: + - source activate $CONDA_ENV - echo "script start" - ci/run_build_docs.sh - ci/script_single.sh From 9f562585f16200f0b43753a4650624b3016efd80 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:49:17 +0100 Subject: [PATCH 10/36] remove source activate --- ci/build_docs.sh | 2 -- ci/incremental/build.sh | 1 - ci/incremental/setup_conda_environment.cmd | 4 ++-- ci/incremental/setup_conda_environment.sh | 5 ++--- ci/script_single.sh | 1 - ci/upload_coverage.sh | 1 - 6 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ci/build_docs.sh b/ci/build_docs.sh index 33340a1c038dc..f89c4369dff4a 100755 --- 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/incremental/build.sh b/ci/incremental/build.sh index 8f2301a3b7ef5..40f78e7d95d52 100755 --- 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 index 35595ffb03695..bd628f3147b79 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,9 +11,9 @@ 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 @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 diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index f3ac99d5e7c5a..559a9e8b802b3 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -12,15 +12,14 @@ 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 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 diff --git a/ci/script_single.sh b/ci/script_single.sh index ea0d48bc2da8a..b57b643290c73 100755 --- 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 index a7ef2fa908079..88aca20590505 100755 --- 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 From bf6bca2bcd248e6f387e9d3001d8e6cfcb9238ae Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 22:53:52 +0100 Subject: [PATCH 11/36] clean the script --- .travis.yml | 2 +- ci/incremental/build.cmd | 2 +- ci/incremental/setup_conda_environment.cmd | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c98286f4c20f..bec92204e393d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,7 +104,7 @@ before_script: - ci/before_script_travis.sh script: - - source activate $CONDA_ENV + - source activate pandas-dev - echo "script start" - ci/run_build_docs.sh - ci/script_single.sh diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd index d2fd06d7d9e50..7115dea8c7eac 100644 --- 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/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index bd628f3147b79..b084e45fa3db7 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -15,7 +15,6 @@ conda remove --all -q -y @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml -call activate %CONDA_ENV% conda list if %errorlevel% neq 0 exit /b %errorlevel% From 2c43b2fc42b3319d2875fca79b3603ed5c1e4bb1 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 23:12:42 +0100 Subject: [PATCH 12/36] debug --- ci/incremental/setup_conda_environment.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index b084e45fa3db7..6c1a484b2d2ef 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,7 +11,7 @@ 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 + @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml From 3a2a193a21a0c53b938eef0ec5d85b23bc202e09 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Thu, 22 Nov 2018 23:35:49 +0100 Subject: [PATCH 13/36] debug --- .travis.yml | 2 +- ci/incremental/setup_conda_environment.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bec92204e393d..cd341a0af0c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,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/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 559a9e8b802b3..6875db39125df 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -20,6 +20,7 @@ time conda env create -q --file="${ENV_FILE}" || exit 1 # Activate first set +v +source activate pandas-dev set -v # remove any installed pandas package From bacb2303d205d13de7a1706948cd458ea5e0c250 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 08:43:33 +0100 Subject: [PATCH 14/36] add pandas-dev back at two lines --- ci/incremental/setup_conda_environment.cmd | 2 +- ci/incremental/setup_conda_environment.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 6c1a484b2d2ef..e44e62cf42442 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,7 +11,7 @@ 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 pandas-dev @rem Scipy, CFFI, jinja2 and IPython are optional dependencies, but exercised in the test suite conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 6875db39125df..e2562626aea50 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -12,16 +12,12 @@ 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 +conda remove --all -q -y -n pandas-dev echo echo "[create env]" time conda env create -q --file="${ENV_FILE}" || exit 1 -# Activate first -set +v -source activate pandas-dev -set -v # remove any installed pandas package # w/o removing anything else From 393f75453dd58d9b895d93c26341ee7c7342ff8a Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 09:09:51 +0100 Subject: [PATCH 15/36] test again after catching the latest master --- ci/incremental/setup_conda_environment.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index e2562626aea50..5e13b6a96ed07 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -5,6 +5,7 @@ set -v -e CONDA_INSTALL="conda install -q -y" PIP_INSTALL="pip install -q" + # Deactivate any environment source deactivate # Display root environment (for debugging) From d9696854acac7273c64608332f7a4398fd71d259 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 11:02:52 +0100 Subject: [PATCH 16/36] debugging --- .travis.yml | 1 + ci/incremental/setup_conda_environment.cmd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd341a0af0c67..c6b97739d8e77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,6 +92,7 @@ before_install: - git tag install: + - call activate pandas-dev - echo "install start" - ci/prep_cython_cache.sh - ci/install_travis.sh diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index e44e62cf42442..62e40868b2334 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -11,7 +11,7 @@ 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 pandas-dev +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 --file=ci\deps\azure-windows-%CONDA_PY%.yaml From a0a978a4076444674f8ed53fa3cbdfebe48978f5 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 11:08:03 +0100 Subject: [PATCH 17/36] debugging --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c6b97739d8e77..eaa3b6d92af0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,7 +92,7 @@ before_install: - git tag install: - - call activate pandas-dev + - source activate pandas-dev - echo "install start" - ci/prep_cython_cache.sh - ci/install_travis.sh From e024ba06dd38014ca7b5c698eac16fc1691a5ec3 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 11:13:36 +0100 Subject: [PATCH 18/36] debugging --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index eaa3b6d92af0f..d27b782c21a3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,6 +95,7 @@ install: - source activate pandas-dev - echo "install start" - ci/prep_cython_cache.sh + - source activate pandas-dev - ci/install_travis.sh - ci/submit_cython_cache.sh - echo "install done" From 26df0d4ac4cb76f508c0db6911b9fdd8bb548fad Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 11:21:41 +0100 Subject: [PATCH 19/36] debugging --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d27b782c21a3c..2e76a0f638f9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,15 +92,14 @@ before_install: - git tag install: - - source activate pandas-dev - echo "install start" - ci/prep_cython_cache.sh - - source activate pandas-dev - ci/install_travis.sh - ci/submit_cython_cache.sh - echo "install done" before_script: + - source activate pandas-dev - ci/install_db_travis.sh - export DISPLAY=":99.0" - ci/before_script_travis.sh From 53f8eaa586bc44752b07beb3d0e6f4b48af6853a Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 11:49:13 +0100 Subject: [PATCH 20/36] debugging --- .travis.yml | 1 - ci/incremental/setup_conda_environment.cmd | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e76a0f638f9c..cd341a0af0c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,7 +99,6 @@ install: - echo "install done" before_script: - - source activate pandas-dev - ci/install_db_travis.sh - export DISPLAY=":99.0" - ci/before_script_travis.sh diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 62e40868b2334..12353ef2113c7 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -13,7 +13,7 @@ conda list @rem Clean up any left-over from a previous build 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 --file=ci\deps\azure-windows-%CONDA_PY%.yaml +conda env create -n pandas-dev --file=ci\deps\azure-windows-%CONDA_PY%.yaml conda list From de8c1bce3508f4d6044865834c094608c508ffba Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 12:15:38 +0100 Subject: [PATCH 21/36] debugging --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd341a0af0c67..899706b5ca6fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,11 +104,12 @@ before_script: - ci/before_script_travis.sh script: - - source activate pandas-dev - echo "script start" + - source activate pandas-dev - ci/run_build_docs.sh - ci/script_single.sh - ci/script_multi.sh + - source activate pandas-dev - ci/code_checks.sh after_success: From 3b6d64688043b355bf440ac1bf83f162d731f9e5 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 12:28:59 +0100 Subject: [PATCH 22/36] debugging --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 899706b5ca6fb..2d9cacd2f269c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,6 +94,7 @@ before_install: install: - echo "install start" - ci/prep_cython_cache.sh + - source activate pandas-dev - ci/install_travis.sh - ci/submit_cython_cache.sh - echo "install done" From 1d9e93a58da1832d833f80a2c40f0828619c0851 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 12:43:26 +0100 Subject: [PATCH 23/36] debugging --- .travis.yml | 1 - ci/incremental/build.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d9cacd2f269c..3f69a17783e3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -110,7 +110,6 @@ script: - ci/run_build_docs.sh - ci/script_single.sh - ci/script_multi.sh - - source activate pandas-dev - ci/code_checks.sh after_success: diff --git a/ci/incremental/build.sh b/ci/incremental/build.sh index 40f78e7d95d52..bdcf61e31c6d0 100755 --- a/ci/incremental/build.sh +++ b/ci/incremental/build.sh @@ -1,5 +1,5 @@ #!/bin/bash - +source activate pandas-dev # Make sure any error below is reported as such set -v -e From e3c9fc1ccf8253c4dfed6bfb0bf375f62b3d6128 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 12:47:53 +0100 Subject: [PATCH 24/36] debugging --- .travis.yml | 1 - ci/azure/linux.yml | 1 + ci/azure/macos.yml | 1 + ci/incremental/build.sh | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f69a17783e3c..3217fc5aa1ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,7 +94,6 @@ before_install: install: - echo "install start" - ci/prep_cython_cache.sh - - source activate pandas-dev - ci/install_travis.sh - ci/submit_cython_cache.sh - echo "install done" diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index b5a8e36d5097d..839638c012842 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -39,6 +39,7 @@ jobs: displayName: 'Before Install' - script: | export PATH=$HOME/miniconda3/bin:$PATH + source activate pandas-dev ci/incremental/build.sh displayName: 'Build' - script: | diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 16f2fa2d4890f..823e4d87de494 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -26,6 +26,7 @@ jobs: displayName: 'Before Install' - script: | export PATH=$HOME/miniconda3/bin:$PATH + source activate pandas-dev ci/incremental/build.sh displayName: 'Build' - script: | diff --git a/ci/incremental/build.sh b/ci/incremental/build.sh index bdcf61e31c6d0..05648037935a3 100755 --- a/ci/incremental/build.sh +++ b/ci/incremental/build.sh @@ -1,5 +1,4 @@ #!/bin/bash -source activate pandas-dev # Make sure any error below is reported as such set -v -e From 603bd0b8c20e93b0c0cadb7e50022918389be1fb Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 13:12:40 +0100 Subject: [PATCH 25/36] debugging --- ci/incremental/setup_conda_environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 5e13b6a96ed07..00d9fd08171a4 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -17,7 +17,7 @@ conda remove --all -q -y -n pandas-dev echo echo "[create env]" -time conda env create -q --file="${ENV_FILE}" || exit 1 +time conda env create -q -n pandas-dev --file="${ENV_FILE}" || exit 1 # remove any installed pandas package From 8a37dd03c8ba56b4d38f3afa91ac7703236d7bd4 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 13:39:40 +0100 Subject: [PATCH 26/36] debugging --- ci/azure/linux.yml | 2 +- ci/azure/macos.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index 839638c012842..33e96df2f1e6e 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -50,7 +50,7 @@ jobs: displayName: 'Test' - script: | export PATH=$HOME/miniconda3/bin:$PATH - 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 - task: PublishTestResults@2 inputs: testResultsFiles: 'test-data-*.xml' diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 823e4d87de494..22c15f31f8459 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -37,7 +37,7 @@ jobs: displayName: 'Test' - script: | export PATH=$HOME/miniconda3/bin:$PATH - 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 - task: PublishTestResults@2 inputs: testResultsFiles: 'test-data-*.xml' From e59c787c783ff361e1c5961e95aa2918961789af Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 14:06:09 +0100 Subject: [PATCH 27/36] debugging --- ci/azure/linux.yml | 1 + ci/azure/macos.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index 33e96df2f1e6e..1f6db02dece47 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -35,6 +35,7 @@ jobs: ci/incremental/install_miniconda.sh export PATH=$HOME/miniconda3/bin:$PATH echo "Setting up Conda environment" + source activate pandas-dev ci/incremental/setup_conda_environment.sh displayName: 'Before Install' - script: | diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 22c15f31f8459..fc79c922de7a5 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -22,6 +22,7 @@ jobs: ci/incremental/install_miniconda.sh export PATH=$HOME/miniconda3/bin:$PATH echo "Setting up Conda environment" + source activate pandas-dev ci/incremental/setup_conda_environment.sh displayName: 'Before Install' - script: | From 4b0b03e450d1b9a383ceb444d48e865ed7194c5e Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 14:59:26 +0100 Subject: [PATCH 28/36] debugging --- ci/azure/linux.yml | 1 + ci/azure/macos.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index 1f6db02dece47..cd5d4c07598c7 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -45,6 +45,7 @@ jobs: displayName: 'Build' - script: | export PATH=$HOME/miniconda3/bin:$PATH + source activate pandas-dev ci/script_single.sh ci/script_multi.sh echo "[Test done]" diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index fc79c922de7a5..2cb39ba063d25 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -32,6 +32,7 @@ jobs: displayName: 'Build' - script: | export PATH=$HOME/miniconda3/bin:$PATH + source activate pandas-dev ci/script_single.sh ci/script_multi.sh echo "[Test done]" From 45e5f06de759929fec452842bb7704e1d2eba351 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Fri, 23 Nov 2018 15:20:07 +0100 Subject: [PATCH 29/36] debugging --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3217fc5aa1ed6..a1f69e8502a85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,7 +116,7 @@ after_success: after_script: - echo "after_script start" - - source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd + - source activate pandas && 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 From 1c4ddfb41b6bc17e16f02e854e6cae49151b84f0 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Sat, 24 Nov 2018 20:27:44 +0100 Subject: [PATCH 30/36] debugging --- .travis.yml | 2 +- ci/azure/linux.yml | 1 - ci/azure/macos.yml | 1 - ci/azure/windows.yml | 3 ++- ci/incremental/setup_conda_environment.cmd | 2 +- ci/incremental/setup_conda_environment.sh | 2 +- ci/script_single.sh | 1 - 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a1f69e8502a85..3217fc5aa1ed6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,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/azure/linux.yml b/ci/azure/linux.yml index cd5d4c07598c7..3e8b669faf359 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -35,7 +35,6 @@ jobs: ci/incremental/install_miniconda.sh export PATH=$HOME/miniconda3/bin:$PATH echo "Setting up Conda environment" - source activate pandas-dev ci/incremental/setup_conda_environment.sh displayName: 'Before Install' - script: | diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 2cb39ba063d25..724e33f8aef20 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -22,7 +22,6 @@ jobs: ci/incremental/install_miniconda.sh export PATH=$HOME/miniconda3/bin:$PATH echo "Setting up Conda environment" - source activate pandas-dev ci/incremental/setup_conda_environment.sh displayName: 'Before Install' - script: | diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 9b87ac7711f40..d3020e5a2daaf 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -24,10 +24,11 @@ jobs: ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | + call activate pandas-dev ci\\incremental\\build.cmd displayName: 'Build' - script: | - call activate %CONDA_ENV% + call activate pandas-dev pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %* displayName: 'Test' - task: PublishTestResults@2 diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 12353ef2113c7..62e40868b2334 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -13,7 +13,7 @@ conda list @rem Clean up any left-over from a previous build 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 pandas-dev --file=ci\deps\azure-windows-%CONDA_PY%.yaml +conda env create --file=ci\deps\azure-windows-%CONDA_PY%.yaml conda list diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 00d9fd08171a4..5e13b6a96ed07 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -17,7 +17,7 @@ conda remove --all -q -y -n pandas-dev echo echo "[create env]" -time conda env create -q -n pandas-dev --file="${ENV_FILE}" || exit 1 +time conda env create -q --file="${ENV_FILE}" || exit 1 # remove any installed pandas package diff --git a/ci/script_single.sh b/ci/script_single.sh index b57b643290c73..cbbb7a49541c2 100755 --- a/ci/script_single.sh +++ b/ci/script_single.sh @@ -2,7 +2,6 @@ echo "[script_single]" - if [ -n "$LOCALE_OVERRIDE" ]; then echo "Setting LC_ALL and LANG to $LOCALE_OVERRIDE" export LC_ALL="$LOCALE_OVERRIDE"; From 61b7f6f48b6eb9dfaa387ec46b1681493cb24a42 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Sat, 24 Nov 2018 20:32:07 +0100 Subject: [PATCH 31/36] debugging --- ci/azure/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index d3020e5a2daaf..ea3c689e3a2e1 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -24,11 +24,11 @@ jobs: ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | - call activate pandas-dev + source activate $CONDA_ENV ci\\incremental\\build.cmd displayName: 'Build' - script: | - call activate pandas-dev + source activate $CONDA_ENV pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %* displayName: 'Test' - task: PublishTestResults@2 From 997d680f06afbe8af8ff00eb1e3393d49e55e3a9 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Sat, 24 Nov 2018 20:57:42 +0100 Subject: [PATCH 32/36] debugging --- ci/incremental/setup_conda_environment.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/incremental/setup_conda_environment.sh b/ci/incremental/setup_conda_environment.sh index 5e13b6a96ed07..f174c17a614d8 100755 --- a/ci/incremental/setup_conda_environment.sh +++ b/ci/incremental/setup_conda_environment.sh @@ -19,6 +19,9 @@ echo echo "[create env]" time conda env create -q --file="${ENV_FILE}" || exit 1 +set +v +source activate pandas-dev +set -v # remove any installed pandas package # w/o removing anything else From 49231a7bad7b7ca3470ab0ac183e2c0a0e73fd33 Mon Sep 17 00:00:00 2001 From: Kaiqi Dong Date: Sat, 24 Nov 2018 21:37:24 +0100 Subject: [PATCH 33/36] debugging --- ci/azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index ea3c689e3a2e1..c45987e3cb066 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -21,6 +21,7 @@ jobs: packageSpecs: '' - script: | + source activate $CONDA_ENV ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | From a0331bf3f67c81e837706f74c3819769dcbde42f Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sat, 24 Nov 2018 20:47:49 +0000 Subject: [PATCH 34/36] Some more fixes --- .circleci/config.yml | 10 ++++++++-- ci/azure/linux.yml | 3 --- ci/azure/macos.yml | 3 +-- ci/azure/windows-py27.yml | 4 ++-- ci/azure/windows.yml | 7 +++---- ci/circle/install_circle.sh | 4 ++-- ci/circle/run_circle.sh | 9 --------- ci/circle/show_circle.sh | 8 -------- ci/code_checks.sh | 1 - ci/incremental/build.cmd | 1 - ci/incremental/setup_conda_environment.cmd | 1 + ci/install_travis.sh | 4 ++-- ci/script_multi.sh | 2 -- 13 files changed, 19 insertions(+), 38 deletions(-) delete mode 100755 ci/circle/run_circle.sh delete mode 100755 ci/circle/show_circle.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 6e789d0aafdb4..7bc54145466fe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,13 @@ jobs: name: build command: | ./ci/circle/install_circle.sh - ./ci/circle/show_circle.sh + export PATH="$MINICONDA_DIR/bin:$PATH" + source activate pandas + python -c "import pandas; pandas.show_versions();" - run: name: test - command: ./ci/circle/run_circle.sh --skip-slow --skip-network + command: | + export PATH="$MINICONDA_DIR/bin:$PATH" + source activate pandas-dev + echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas" + pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml --skip-slow --skip-network pandas diff --git a/ci/azure/linux.yml b/ci/azure/linux.yml index 3e8b669faf359..e7d2dde84dba4 100644 --- a/ci/azure/linux.yml +++ b/ci/azure/linux.yml @@ -12,20 +12,17 @@ jobs: py27_np_19: ENV_FILE: ci/deps/azure-27-compat.yaml CONDA_PY: "27" - CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" py36_locale: ENV_FILE: ci/deps/azure-37-locale.yaml CONDA_PY: "37" - CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" LOCALE_OVERRIDE: "zh_CN.UTF-8" py36_locale_slow: ENV_FILE: ci/deps/azure-36-locale_slow.yaml CONDA_PY: "36" - CONDA_ENV: pandas TEST_ARGS: "--only-slow --skip-network" steps: diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 724e33f8aef20..d537f0c70cbec 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -12,7 +12,6 @@ jobs: py35_np_120: ENV_FILE: ci/deps/azure-macos-35.yaml CONDA_PY: "35" - CONDA_ENV: pandas TEST_ARGS: "--skip-slow --skip-network" steps: @@ -67,4 +66,4 @@ jobs: # note that this will produce $LASTEXITCODE=1 Write-Error "$($matches[1]) tests failed" } - displayName: Check for test failures \ No newline at end of file + displayName: Check for test failures diff --git a/ci/azure/windows-py27.yml b/ci/azure/windows-py27.yml index fd72b7080e84d..ac918f3becd2e 100644 --- a/ci/azure/windows-py27.yml +++ b/ci/azure/windows-py27.yml @@ -12,7 +12,6 @@ jobs: py36_np121: ENV_FILE: ci/deps/azure-windows-27.yaml CONDA_PY: "27" - CONDA_ENV: pandas steps: - task: CondaEnvironment@1 @@ -33,10 +32,11 @@ jobs: ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | + call activate pandas-dev ci\\incremental\\build.cmd displayName: 'Build' - script: | - call activate %CONDA_ENV% + call activate pandas-dev pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %* displayName: 'Test' - task: PublishTestResults@2 diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index ea3c689e3a2e1..f0ebba509e441 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -12,7 +12,6 @@ jobs: py36_np14: ENV_FILE: ci/deps/azure-windows-36.yaml CONDA_PY: "36" - CONDA_ENV: pandas steps: - task: CondaEnvironment@1 @@ -24,11 +23,11 @@ jobs: ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | - source activate $CONDA_ENV + call activate pandas-dev ci\\incremental\\build.cmd displayName: 'Build' - script: | - source activate $CONDA_ENV + call activate pandas-dev pytest --junitxml=test-data.xml --skip-slow --skip-network pandas -n 2 -r sxX --strict --durations=10 %* displayName: 'Test' - task: PublishTestResults@2 @@ -47,4 +46,4 @@ jobs: # note that this will produce $LASTEXITCODE=1 Write-Error "$($matches[1]) tests failed" } - displayName: Check for test failures \ No newline at end of file + displayName: Check for test failures diff --git a/ci/circle/install_circle.sh b/ci/circle/install_circle.sh index f8bcf6bcffc99..0918e8790fca2 100755 --- a/ci/circle/install_circle.sh +++ b/ci/circle/install_circle.sh @@ -60,9 +60,9 @@ fi # create envbuild deps echo "[create env]" -time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1 +time conda env create -q --file="${ENV_FILE}" || exit 1 -source activate pandas +source activate pandas-dev # remove any installed pandas package # w/o removing anything else diff --git a/ci/circle/run_circle.sh b/ci/circle/run_circle.sh deleted file mode 100755 index 803724c2f492d..0000000000000 --- a/ci/circle/run_circle.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -echo "[running tests]" -export PATH="$MINICONDA_DIR/bin:$PATH" - -source activate pandas - -echo "pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas" -pytest --strict --durations=10 --color=no --junitxml=$CIRCLE_TEST_REPORTS/reports/junit.xml $@ pandas diff --git a/ci/circle/show_circle.sh b/ci/circle/show_circle.sh deleted file mode 100755 index bfaa65c1d84f2..0000000000000 --- a/ci/circle/show_circle.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -echo "[installed versions]" - -export PATH="$MINICONDA_DIR/bin:$PATH" -source activate pandas - -python -c "import pandas; pandas.show_versions();" diff --git a/ci/code_checks.sh b/ci/code_checks.sh index 86e7003681e98..e6cef3e4275c5 100755 --- a/ci/code_checks.sh +++ b/ci/code_checks.sh @@ -20,7 +20,6 @@ echo "inside $0" [[ -z "$1" || "$1" == "lint" || "$1" == "patterns" || "$1" == "doctests" || "$1" == "dependencies" ]] \ || { echo "Unknown command $1. Usage: $0 [lint|patterns|doctests|dependencies]"; exit 9999; } -source activate pandas BASE_DIR="$(dirname $0)/.." RET=0 CHECK=$1 diff --git a/ci/incremental/build.cmd b/ci/incremental/build.cmd index 7115dea8c7eac..2cce38c03f406 100644 --- a/ci/incremental/build.cmd +++ b/ci/incremental/build.cmd @@ -1,6 +1,5 @@ @rem https://github.com/numba/numba/blob/master/buildscripts/incremental/build.cmd - @rem Build numba extensions without silencing compile errors python setup.py build_ext -q --inplace diff --git a/ci/incremental/setup_conda_environment.cmd b/ci/incremental/setup_conda_environment.cmd index 62e40868b2334..c104d78591384 100644 --- a/ci/incremental/setup_conda_environment.cmd +++ b/ci/incremental/setup_conda_environment.cmd @@ -15,6 +15,7 @@ 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 --file=ci\deps\azure-windows-%CONDA_PY%.yaml +call activate pandas-dev conda list if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/ci/install_travis.sh b/ci/install_travis.sh index fd4a36f86db6c..d1a940f119228 100755 --- a/ci/install_travis.sh +++ b/ci/install_travis.sh @@ -80,9 +80,9 @@ echo echo "[create env]" # create our environment -time conda env create -q -n pandas --file="${ENV_FILE}" || exit 1 +time conda env create -q --file="${ENV_FILE}" || exit 1 -source activate pandas +source activate pandas-dev # remove any installed pandas package # w/o removing anything else diff --git a/ci/script_multi.sh b/ci/script_multi.sh index e56d5da7232b2..dd79f1628590c 100755 --- a/ci/script_multi.sh +++ b/ci/script_multi.sh @@ -2,8 +2,6 @@ echo "[script multi]" -source activate pandas - if [ -n "$LOCALE_OVERRIDE" ]; then export LC_ALL="$LOCALE_OVERRIDE"; echo "Setting LC_ALL to $LOCALE_OVERRIDE" From afe3b1f8b55f744de8d64c331eabe678fd40590d Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sat, 24 Nov 2018 20:48:45 +0000 Subject: [PATCH 35/36] Removing unneeded activation --- ci/azure/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 5a1fab480946b..f0ebba509e441 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -20,7 +20,6 @@ jobs: packageSpecs: '' - script: | - source activate $CONDA_ENV ci\\incremental\\setup_conda_environment.cmd displayName: 'Before Install' - script: | From fbde055d3083886e5f28120cfe2a5390bfe0b07e Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Sat, 24 Nov 2018 22:09:25 +0000 Subject: [PATCH 36/36] fixing wrong environment name in circle --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7bc54145466fe..dc4162a0674fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ jobs: command: | ./ci/circle/install_circle.sh export PATH="$MINICONDA_DIR/bin:$PATH" - source activate pandas + source activate pandas-dev python -c "import pandas; pandas.show_versions();" - run: name: test