From 4912eb11672a1ecba3a3474ee53f91e53a2489d4 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 11:26:12 -0600 Subject: [PATCH 01/31] CI: use conda from ci --- ci/azure/posix.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 4cb4eaf95f6f5..1a4c1d13ae7b4 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -80,10 +80,17 @@ jobs: displayName: 'Install extra packages' - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' - displayName: 'Set conda path' + displayName: 'Add conda to PATH' - - script: ci/setup_env.sh - displayName: 'Setup environment and build pandas' + - script: conda env create --quiet --file $(ENV_FILE) + displayName: Create Anaconda environment + + - script: | + source activate pandas-dev + conda list + python setup.py build_ext -q -j 4 + python -m pip install --no-build-isolation -e . + displayName: 'Build' - script: | source activate pandas-dev From 80c751ec252a2ba2ffac9d7a84c8a46bac11a327 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 11:32:09 -0600 Subject: [PATCH 02/31] CI: use conda from ci --- ci/azure/posix.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 1a4c1d13ae7b4..cc2b02b5c02dd 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -73,15 +73,21 @@ jobs: steps: - script: | - if [ "$(uname)" == "Linux" ]; then - sudo apt-get update - sudo apt-get install -y libc6-dev-i386 $EXTRA_APT - fi + sudo apt-get update + sudo apt-get install -y libc6-dev-i386 $EXTRA_APT displayName: 'Install extra packages' + condition: eq(parameters.name, 'Linux') - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' displayName: 'Add conda to PATH' + - bash: sudo chown -R $USER $CONDA + displayName: Take ownership of conda installation + condition: eq(parameters.name, 'macOS') + + - script: conda update conda' + displayName: 'Update conda' + - script: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment From b0ff88217cd3bc6d882e97ca26b39ae79e9baa4c Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 12:21:05 -0600 Subject: [PATCH 03/31] CI: use conda from ci --- ci/azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index cc2b02b5c02dd..a042aa26ef2af 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -76,14 +76,14 @@ jobs: sudo apt-get update sudo apt-get install -y libc6-dev-i386 $EXTRA_APT displayName: 'Install extra packages' - condition: eq(parameters.name, 'Linux') + condition: eq('${{ parameters.name }}', 'Linux') - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' displayName: 'Add conda to PATH' - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation - condition: eq(parameters.name, 'macOS') + condition: eq('${{ parameters.name }}', 'macOS') - script: conda update conda' displayName: 'Update conda' From 7e685e8f07541cb2654a11e11198552d74888587 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 12:32:17 -0600 Subject: [PATCH 04/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index a042aa26ef2af..eb28ae0611f09 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -81,7 +81,7 @@ jobs: - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' displayName: 'Add conda to PATH' - - bash: sudo chown -R $USER $CONDA + - script: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation condition: eq('${{ parameters.name }}', 'macOS') From 0371e8f25869074f86f50726ba4fc3381b7df194 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 13:10:36 -0600 Subject: [PATCH 05/31] CI: use conda from ci --- ci/azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index eb28ae0611f09..9487f4eade26d 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -85,8 +85,8 @@ jobs: displayName: Take ownership of conda installation condition: eq('${{ parameters.name }}', 'macOS') - - script: conda update conda' - displayName: 'Update conda' + - script: conda update conda + displayName: Update conda - script: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment From 2fe866a8472e477c97a2074793640a8d845dce37 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 13:55:23 -0600 Subject: [PATCH 06/31] CI: use conda from ci --- ci/azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 9487f4eade26d..f2127b49c5c31 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -85,10 +85,10 @@ jobs: displayName: Take ownership of conda installation condition: eq('${{ parameters.name }}', 'macOS') - - script: conda update conda + - script: conda update --yes conda displayName: Update conda - - script: conda env create --quiet --file $(ENV_FILE) + - script: conda env create --quiet --yes --file $(ENV_FILE) displayName: Create Anaconda environment - script: | From e54d80b32af131775c812a82a00c9b679c9da96e Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 13:56:01 -0600 Subject: [PATCH 07/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index f2127b49c5c31..6aad2085f9972 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -85,7 +85,7 @@ jobs: displayName: Take ownership of conda installation condition: eq('${{ parameters.name }}', 'macOS') - - script: conda update --yes conda + - script: conda update --quiet --yes conda displayName: Update conda - script: conda env create --quiet --yes --file $(ENV_FILE) From 079bb2742108b53f4d78241c4505b8d89cff2bbd Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 14:50:29 -0600 Subject: [PATCH 08/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 6aad2085f9972..7a7b0ce64dd9a 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -88,7 +88,7 @@ jobs: - script: conda update --quiet --yes conda displayName: Update conda - - script: conda env create --quiet --yes --file $(ENV_FILE) + - script: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment - script: | From bd1af56f0b527d0f73839e1a0936db9c877ed4e7 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 17:29:27 -0600 Subject: [PATCH 09/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 7a7b0ce64dd9a..9a63149cc2d84 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -91,7 +91,7 @@ jobs: - script: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment - - script: | + - bash: | source activate pandas-dev conda list python setup.py build_ext -q -j 4 From f32335472455a6feb6b082a2d1e002de8e58358b Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 17:30:14 -0600 Subject: [PATCH 10/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 9a63149cc2d84..81eb8673318ee 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -98,7 +98,7 @@ jobs: python -m pip install --no-build-isolation -e . displayName: 'Build' - - script: | + - bash: | source activate pandas-dev ci/run_tests.sh displayName: 'Test' From 7c29e8b4322940852c62251047ed50b0730953b3 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 21:59:24 -0600 Subject: [PATCH 11/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 81eb8673318ee..bfea1a26782d2 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -88,7 +88,7 @@ jobs: - script: conda update --quiet --yes conda displayName: Update conda - - script: conda env create --quiet --file $(ENV_FILE) + - bash: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment - bash: | From ea745b1f2fc55a536531c4bfc14c053739eb9349 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 22:16:34 -0600 Subject: [PATCH 12/31] CI: use conda from ci --- ci/azure/posix.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index bfea1a26782d2..139cfc3b8bad8 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -78,14 +78,14 @@ jobs: displayName: 'Install extra packages' condition: eq('${{ parameters.name }}', 'Linux') - - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' + - bash: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' displayName: 'Add conda to PATH' - - script: sudo chown -R $USER $CONDA + - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation condition: eq('${{ parameters.name }}', 'macOS') - - script: conda update --quiet --yes conda + - bash: conda update --quiet --yes conda displayName: Update conda - bash: conda env create --quiet --file $(ENV_FILE) @@ -103,7 +103,7 @@ jobs: ci/run_tests.sh displayName: 'Test' - - script: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd + - bash: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd displayName: 'Build versions' - task: PublishTestResults@2 @@ -114,7 +114,7 @@ jobs: testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} displayName: 'Publish test results' - - script: | + - bash: | source activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From bc95cde9e8328082214a0d4176d032b61eeab7d6 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 22:53:16 -0600 Subject: [PATCH 13/31] CI: use conda from ci --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 139cfc3b8bad8..e1d91131c8fa5 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -93,7 +93,7 @@ jobs: - bash: | source activate pandas-dev - conda list + conda env list python setup.py build_ext -q -j 4 python -m pip install --no-build-isolation -e . displayName: 'Build' From c78dc47e51c85450ac95fe40a00873a2830db032 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 23:25:08 -0600 Subject: [PATCH 14/31] CI: use conda from ci --- ci/azure/posix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index e1d91131c8fa5..97dba72ac4b5f 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -92,8 +92,8 @@ jobs: displayName: Create Anaconda environment - bash: | - source activate pandas-dev - conda env list + conda activate pandas-dev + conda list python setup.py build_ext -q -j 4 python -m pip install --no-build-isolation -e . displayName: 'Build' From c2ee4a35eea79b2e6be34fb43e3fae33596101ef Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 23:38:07 -0600 Subject: [PATCH 15/31] CI: use conda from ci --- ci/azure/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 97dba72ac4b5f..40d1399397193 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -92,6 +92,7 @@ jobs: displayName: Create Anaconda environment - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev conda list python setup.py build_ext -q -j 4 From fdb081b274787645f34512b968cc549a3a5145e5 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Tue, 22 Dec 2020 23:46:05 -0600 Subject: [PATCH 16/31] CI: use conda from ci --- ci/azure/posix.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 40d1399397193..c9b61d602bd8a 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -100,7 +100,8 @@ jobs: displayName: 'Build' - bash: | - source activate pandas-dev + eval "$(conda shell.bash hook)" + conda activate pandas-dev ci/run_tests.sh displayName: 'Test' From 2be2ae741e6e27cb8dc1a58795ca9cd8293a0346 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Wed, 23 Dec 2020 00:31:35 -0600 Subject: [PATCH 17/31] CI: use conda from ci --- ci/azure/posix.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index c9b61d602bd8a..8101f6f456a70 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -105,7 +105,10 @@ jobs: ci/run_tests.sh displayName: 'Test' - - bash: source activate pandas-dev && pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd + - bash: | + eval "$(conda shell.bash hook)" + conda activate pandas-dev + pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd displayName: 'Build versions' - task: PublishTestResults@2 From 1b50515abe34219cd46242a827e956790f367147 Mon Sep 17 00:00:00 2001 From: VirosaLi <2EkF8qUgpNkj> Date: Wed, 23 Dec 2020 01:14:27 -0600 Subject: [PATCH 18/31] CI: use conda from ci --- ci/azure/posix.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 8101f6f456a70..dd221fdd8a1f3 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -107,7 +107,7 @@ jobs: - bash: | eval "$(conda shell.bash hook)" - conda activate pandas-dev + conda activate pandas-dev pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd displayName: 'Build versions' @@ -120,6 +120,7 @@ jobs: displayName: 'Publish test results' - bash: | - source activate pandas-dev + eval "$(conda shell.bash hook)" + conda activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From 37a287a3dc6881e2f7c93807585f21c9f4535edf Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 21:02:17 -0500 Subject: [PATCH 19/31] rebase --- azure-pipelines.yml | 3 +-- ci/azure/{posix.yml => macos.yml} | 30 ++++++++++++------------------ 2 files changed, 13 insertions(+), 20 deletions(-) rename ci/azure/{posix.yml => macos.yml} (57%) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 56da4e87f2709..26d8e073c0143 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,8 +11,7 @@ variables: PYTEST_WORKERS: auto jobs: -# Mac and Linux use the same template -- template: ci/azure/posix.yml +- template: ci/azure/macos.yml parameters: name: macOS vmImage: macOS-10.14 diff --git a/ci/azure/posix.yml b/ci/azure/macos.yml similarity index 57% rename from ci/azure/posix.yml rename to ci/azure/macos.yml index 5b2c68ddbe749..96e9456330208 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/macos.yml @@ -8,44 +8,39 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - ${{ if eq(parameters.name, 'macOS') }}: - py37_macos: - ENV_FILE: ci/deps/azure-macos-37.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network" + py37_macos: + ENV_FILE: ci/deps/azure-macos-37.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network" steps: - - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' + - bash: echo '##vso[task.prependpath]$CONDA/bin' displayName: 'Set conda path' - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation - condition: eq('${{ parameters.name }}', 'macOS') - bash: conda update --quiet --yes conda displayName: Update conda - - bash: conda env create --quiet --file $(ENV_FILE) + - bash: conda create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment - bash: | - eval "$(conda shell.bash hook)" - conda activate pandas-dev + source activate pandas-dev conda list python setup.py build_ext -q -j 4 python -m pip install --no-build-isolation -e . - displayName: 'Build' + displayName: 'Build pandas' - bash: | - eval "$(conda shell.bash hook)" - conda activate pandas-dev + source activate pandas-dev ci/run_tests.sh displayName: 'Test' - bash: | - eval "$(conda shell.bash hook)" - conda activate pandas-dev - pushd /tmp && python -c "import pandas; pandas.show_versions();" && popd + source activate pandas-dev + python -c "import pandas; pandas.show_versions();" displayName: 'Build versions' - task: PublishTestResults@2 @@ -57,7 +52,6 @@ jobs: displayName: 'Publish test results' - bash: | - eval "$(conda shell.bash hook)" - conda activate pandas-dev + source activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From fda6a8469393dd3c5c8e467e5dfac8142720e96e Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 21:05:19 -0500 Subject: [PATCH 20/31] fix build commend --- ci/azure/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 96e9456330208..44fbc79cd822a 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -30,7 +30,7 @@ jobs: source activate pandas-dev conda list python setup.py build_ext -q -j 4 - python -m pip install --no-build-isolation -e . + python -m pip install -e . --no-build-isolation --no-use-pep517 displayName: 'Build pandas' - bash: | From a7a01d8d859c71b0b03edec43641b7c5e2ba79bc Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 21:07:21 -0500 Subject: [PATCH 21/31] fix env commend --- ci/azure/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 44fbc79cd822a..300aba8e36a46 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -23,7 +23,7 @@ jobs: - bash: conda update --quiet --yes conda displayName: Update conda - - bash: conda create --quiet --file $(ENV_FILE) + - bash: conda env create --quiet --file $(ENV_FILE) displayName: Create Anaconda environment - bash: | From f0f9b47d9d1638e29eb0a6f6e5133d19284091f2 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 21:13:04 -0500 Subject: [PATCH 22/31] fix env commend --- ci/azure/macos.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 300aba8e36a46..032dcb54f0079 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -27,19 +27,19 @@ jobs: displayName: Create Anaconda environment - bash: | - source activate pandas-dev + conda activate pandas-dev conda list python setup.py build_ext -q -j 4 python -m pip install -e . --no-build-isolation --no-use-pep517 displayName: 'Build pandas' - bash: | - source activate pandas-dev + conda activate pandas-dev ci/run_tests.sh displayName: 'Test' - bash: | - source activate pandas-dev + conda activate pandas-dev python -c "import pandas; pandas.show_versions();" displayName: 'Build versions' @@ -52,6 +52,6 @@ jobs: displayName: 'Publish test results' - bash: | - source activate pandas-dev + conda activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From 144c50da74359cc258961d6f973f864cfcfe923b Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 21:23:39 -0500 Subject: [PATCH 23/31] fix env commend --- ci/azure/macos.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index 032dcb54f0079..a1a290ed4fd88 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -27,6 +27,7 @@ jobs: displayName: Create Anaconda environment - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev conda list python setup.py build_ext -q -j 4 @@ -34,11 +35,13 @@ jobs: displayName: 'Build pandas' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev ci/run_tests.sh displayName: 'Test' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev python -c "import pandas; pandas.show_versions();" displayName: 'Build versions' @@ -52,6 +55,7 @@ jobs: displayName: 'Publish test results' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From 2c8813fc47bf31910cedd1ae3d5e8d35dd13acbd Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Thu, 10 Jun 2021 22:38:35 -0500 Subject: [PATCH 24/31] update vmimage version --- azure-pipelines.yml | 4 ++-- ci/azure/windows.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 26d8e073c0143..5be7d5e0b0826 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,12 +14,12 @@ jobs: - template: ci/azure/macos.yml parameters: name: macOS - vmImage: macOS-10.14 + vmImage: macOS-10.15 - template: ci/azure/windows.yml parameters: name: Windows - vmImage: vs2017-win2016 + vmImage: windows-2019 - job: py37_32bit pool: diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 5644ad46714d5..bdd2e1e6d824d 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -9,12 +9,12 @@ jobs: strategy: matrix: py37_np17: - ENV_FILE: ci/deps/azure-windows-37.yaml + ENV_FILE: ci\\deps\\azure-windows-37.yaml CONDA_PY: "37" PATTERN: "not slow and not network" py38_np18: - ENV_FILE: ci/deps/azure-windows-38.yaml + ENV_FILE: ci\\deps\\azure-windows-38.yaml CONDA_PY: "38" PATTERN: "not slow and not network and not high_memory" @@ -24,18 +24,18 @@ jobs: Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin" displayName: 'Add conda to PATH' - - script: conda update -q -n base conda - displayName: 'Update conda' + - bash: conda update --quiet --yes conda + displayName: Update conda - bash: | - conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml + conda env create --quiet --file $(ENV_FILE) displayName: 'Create anaconda environment' - bash: | source activate pandas-dev conda list python setup.py build_ext -q -j 4 - python -m pip install --no-build-isolation -e . + python -m pip install -e . --no-build-isolation --no-use-pep517 displayName: 'Build' - bash: | From bde28cab191366401295b4e0e7564abbcf9d36c7 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 08:33:58 -0500 Subject: [PATCH 25/31] fix windows --- ci/azure/windows.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index bdd2e1e6d824d..7fce84ac172c6 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -21,25 +21,23 @@ jobs: steps: - powershell: | Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - Write-Host "##vso[task.prependpath]$HOME/miniconda3/bin" displayName: 'Add conda to PATH' - - bash: conda update --quiet --yes conda + - script: conda update --quiet --yes conda displayName: Update conda - - bash: | - conda env create --quiet --file $(ENV_FILE) + - script: conda env create --quiet --file $(ENV_FILE) displayName: 'Create anaconda environment' - - bash: | - source activate pandas-dev + - script: | + call activate pandas-dev conda list python setup.py build_ext -q -j 4 python -m pip install -e . --no-build-isolation --no-use-pep517 displayName: 'Build' - - bash: | - source activate pandas-dev + - script: | + call activate pandas-dev ci/run_tests.sh displayName: 'Test' @@ -52,6 +50,6 @@ jobs: displayName: 'Publish test results' - bash: | - source activate pandas-dev + call activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From 14b5cb77c9589d9a609ab2b995f0a3fe5c0948ce Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 08:47:13 -0500 Subject: [PATCH 26/31] fix windows --- ci/azure/windows.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 7fce84ac172c6..d81e55f3626a0 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -29,15 +29,15 @@ jobs: - script: conda env create --quiet --file $(ENV_FILE) displayName: 'Create anaconda environment' - - script: | - call activate pandas-dev + - bash: | + conda activate pandas-dev conda list python setup.py build_ext -q -j 4 python -m pip install -e . --no-build-isolation --no-use-pep517 displayName: 'Build' - - script: | - call activate pandas-dev + - bash: | + conda activate pandas-dev ci/run_tests.sh displayName: 'Test' @@ -50,6 +50,6 @@ jobs: displayName: 'Publish test results' - bash: | - call activate pandas-dev + conda activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From 61932dd70b839d3282ec2b9d731b015558b4ef43 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 09:01:02 -0500 Subject: [PATCH 27/31] fix windows --- ci/azure/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index d81e55f3626a0..6873cb80130e6 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -30,6 +30,7 @@ jobs: displayName: 'Create anaconda environment' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev conda list python setup.py build_ext -q -j 4 @@ -37,6 +38,7 @@ jobs: displayName: 'Build' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev ci/run_tests.sh displayName: 'Test' @@ -50,6 +52,7 @@ jobs: displayName: 'Publish test results' - bash: | + eval "$(conda shell.bash hook)" conda activate pandas-dev python ci/print_skipped.py displayName: 'Print skipped tests' From a92dbf6b95fbd28a8a160b789145a22e380e20c9 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 11 Jun 2021 10:48:55 -0500 Subject: [PATCH 28/31] str --- azure-pipelines.yml | 15 ++++++++------- ci/azure/macos.yml | 12 ++++++------ ci/azure/windows.yml | 18 ++++++++++++------ 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5be7d5e0b0826..62b89de2ae1d7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ jobs: name: Windows vmImage: windows-2019 -- job: py37_32bit +- job: Linux_py37_32bit pool: vmImage: ubuntu-18.04 @@ -34,14 +34,15 @@ jobs: . ~/virtualenvs/pandas-dev/bin/activate && \ python -m pip install --no-deps -U pip wheel setuptools && \ pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \ - python setup.py build_ext -q -j2 && \ - python -m pip install --no-build-isolation -e . && \ - pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml" - displayName: 'Run 32-bit manylinux2014 Docker Build / Tests' + python setup.py build_ext -q -j 4 && \ + python -m pip install -e . --no-build-isolation --no-use-pep517 && \ + pytest -m 'not slow and not network and not clipboard' pandas" + displayName: Run 32-bit manylinux2014 Docker Build / Tests - task: PublishTestResults@2 condition: succeededOrFailed() inputs: - testResultsFiles: '**/test-*.xml' failTaskOnFailedTests: true - testRunTitle: 'Publish test results for Python 3.7-32 bit full Linux' + testResultsFiles: 'test-data.xml' + testRunTitle: 'Linux Python 3.7 32-bit' + displayName: Publish test results diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index a1a290ed4fd88..e2c09c82d21a5 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -15,7 +15,7 @@ jobs: steps: - bash: echo '##vso[task.prependpath]$CONDA/bin' - displayName: 'Set conda path' + displayName: Add conda to PATH - bash: sudo chown -R $USER $CONDA displayName: Take ownership of conda installation @@ -32,19 +32,19 @@ jobs: conda list python setup.py build_ext -q -j 4 python -m pip install -e . --no-build-isolation --no-use-pep517 - displayName: 'Build pandas' + displayName: Build pandas - bash: | eval "$(conda shell.bash hook)" conda activate pandas-dev ci/run_tests.sh - displayName: 'Test' + displayName: Test - bash: | eval "$(conda shell.bash hook)" conda activate pandas-dev python -c "import pandas; pandas.show_versions();" - displayName: 'Build versions' + displayName: Build versions - task: PublishTestResults@2 condition: succeededOrFailed() @@ -52,10 +52,10 @@ jobs: failTaskOnFailedTests: true testResultsFiles: 'test-data.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} - displayName: 'Publish test results' + displayName: Publish test results - bash: | eval "$(conda shell.bash hook)" conda activate pandas-dev python ci/print_skipped.py - displayName: 'Print skipped tests' + displayName: Print skipped tests diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 6873cb80130e6..5aea907e4e526 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -21,13 +21,13 @@ jobs: steps: - powershell: | Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - displayName: 'Add conda to PATH' + displayName: Add conda to PATH - script: conda update --quiet --yes conda displayName: Update conda - script: conda env create --quiet --file $(ENV_FILE) - displayName: 'Create anaconda environment' + displayName: Create anaconda environment - bash: | eval "$(conda shell.bash hook)" @@ -35,13 +35,19 @@ jobs: conda list python setup.py build_ext -q -j 4 python -m pip install -e . --no-build-isolation --no-use-pep517 - displayName: 'Build' + displayName: Build pandas - bash: | eval "$(conda shell.bash hook)" conda activate pandas-dev ci/run_tests.sh - displayName: 'Test' + displayName: Test + + - bash: | + eval "$(conda shell.bash hook)" + conda activate pandas-dev + python -c "import pandas; pandas.show_versions();" + displayName: Build versions - task: PublishTestResults@2 condition: succeededOrFailed() @@ -49,10 +55,10 @@ jobs: failTaskOnFailedTests: true testResultsFiles: 'test-data.xml' testRunTitle: ${{ format('{0}-$(CONDA_PY)', parameters.name) }} - displayName: 'Publish test results' + displayName: Publish test results - bash: | eval "$(conda shell.bash hook)" conda activate pandas-dev python ci/print_skipped.py - displayName: 'Print skipped tests' + displayName: Print skipped tests From 8a61398a944bbcf7f809b06e5e717ce0f21bbe35 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 16 Jul 2021 21:11:47 -0500 Subject: [PATCH 29/31] resolve conflict --- azure-pipelines.yml | 18 ++++++++---------- ci/azure/macos.yml | 6 +++--- ci/azure/windows.yml | 12 +++++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 62b89de2ae1d7..008033df3c833 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,7 +21,7 @@ jobs: name: Windows vmImage: windows-2019 -- job: Linux_py37_32bit +- job: py38_32bit pool: vmImage: ubuntu-18.04 @@ -30,19 +30,17 @@ jobs: docker pull quay.io/pypa/manylinux2014_i686 docker run -v $(pwd):/pandas quay.io/pypa/manylinux2014_i686 \ /bin/bash -xc "cd pandas && \ - /opt/python/cp37-cp37m/bin/python -m venv ~/virtualenvs/pandas-dev && \ + /opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev && \ . ~/virtualenvs/pandas-dev/bin/activate && \ python -m pip install --no-deps -U pip wheel setuptools && \ pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis pytest-azurepipelines && \ - python setup.py build_ext -q -j 4 && \ - python -m pip install -e . --no-build-isolation --no-use-pep517 && \ - pytest -m 'not slow and not network and not clipboard' pandas" - displayName: Run 32-bit manylinux2014 Docker Build / Tests - + python setup.py build_ext -q -j2 && \ + python -m pip install --no-build-isolation -e . && \ + pytest -m 'not slow and not network and not clipboard' pandas --junitxml=test-data.xml" + displayName: 'Run 32-bit manylinux2014 Docker Build / Tests' - task: PublishTestResults@2 condition: succeededOrFailed() inputs: + testResultsFiles: '**/test-*.xml' failTaskOnFailedTests: true - testResultsFiles: 'test-data.xml' - testRunTitle: 'Linux Python 3.7 32-bit' - displayName: Publish test results + testRunTitle: 'Publish test results for Python 3.8-32 bit full Linux' diff --git a/ci/azure/macos.yml b/ci/azure/macos.yml index e2c09c82d21a5..e9bd41b9d1d50 100644 --- a/ci/azure/macos.yml +++ b/ci/azure/macos.yml @@ -8,9 +8,9 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - py37_macos: - ENV_FILE: ci/deps/azure-macos-37.yaml - CONDA_PY: "37" + py38_macos: + ENV_FILE: ci/deps/azure-macos-38.yaml + CONDA_PY: "38" PATTERN: "not slow and not network" steps: diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 5aea907e4e526..28f8d2d349753 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -8,15 +8,17 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - py37_np17: - ENV_FILE: ci\\deps\\azure-windows-37.yaml - CONDA_PY: "37" - PATTERN: "not slow and not network" - py38_np18: ENV_FILE: ci\\deps\\azure-windows-38.yaml CONDA_PY: "38" + PATTERN: "not slow and not network" + PYTEST_WORKERS: 2 # GH-42236 + + py39: + ENV_FILE: ci\\deps\\azure-windows-39.yaml + CONDA_PY: "39" PATTERN: "not slow and not network and not high_memory" + PYTEST_WORKERS: 2 # GH-42236 steps: - powershell: | From 6f73e0154a22c1e775a091749303a982254b4b81 Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 16 Jul 2021 21:12:52 -0500 Subject: [PATCH 30/31] resolve conflict --- 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 28f8d2d349753..8143d116ec239 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -9,13 +9,13 @@ jobs: strategy: matrix: py38_np18: - ENV_FILE: ci\\deps\\azure-windows-38.yaml + ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 py39: - ENV_FILE: ci\\deps\\azure-windows-39.yaml + ENV_FILE: ci/deps/azure-windows-39.yaml CONDA_PY: "39" PATTERN: "not slow and not network and not high_memory" PYTEST_WORKERS: 2 # GH-42236 From 2d32a503102100431dc306faedd7dadac2648c5a Mon Sep 17 00:00:00 2001 From: Fangchen Li Date: Fri, 16 Jul 2021 21:15:42 -0500 Subject: [PATCH 31/31] resolve conflict --- 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 8143d116ec239..28f8d2d349753 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -9,13 +9,13 @@ jobs: strategy: matrix: py38_np18: - ENV_FILE: ci/deps/azure-windows-38.yaml + ENV_FILE: ci\\deps\\azure-windows-38.yaml CONDA_PY: "38" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 py39: - ENV_FILE: ci/deps/azure-windows-39.yaml + ENV_FILE: ci\\deps\\azure-windows-39.yaml CONDA_PY: "39" PATTERN: "not slow and not network and not high_memory" PYTEST_WORKERS: 2 # GH-42236