From bcb187f800105980b2a34072d5f50eef7406e780 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Sun, 20 Sep 2020 21:51:17 -0500
Subject: [PATCH 01/16] CI/CLN: update travis

---
 .travis.yml     | 20 +++++++++-----------
 ci/build39.sh   |  1 -
 ci/setup_env.sh | 16 +++-------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a38e90bbce8ba..d011c77fddb91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,23 @@
 language: python
 python: 3.7
 
+addons:
+  apt:
+    update: true
+
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true
 # To delete caches go to https://travis-ci.org/OWNER/REPOSITORY/caches or run
 # travis cache --delete inside the project directory from the travis command line client
 # The cache directories will be deleted if anything in ci/ changes in a commit
 cache:
+  pip: true
   ccache: true
   directories:
     - $HOME/.cache # cython cache
-    - $HOME/.ccache # compiler cache
 
 env:
   global:
-    # Variable for test workers
     - PYTEST_WORKERS="auto"
     # create a github personal access token
     # cd pandas-dev/pandas
@@ -22,18 +25,17 @@ env:
     - secure: "EkWLZhbrp/mXJOx38CHjs7BnjXafsqHtwxPQrqWy457VDFWhIY1DMnIR/lOWG+a20Qv52sCsFtiZEmMfUjf0pLGXOqurdxbYBGJ7/ikFLk9yV2rDwiArUlVM9bWFnFxHvdz9zewBH55WurrY4ShZWyV+x2dWjjceWG5VpWeI6sA="
 
 git:
-  # for cloning
   depth: false
 
 matrix:
   fast_finish: true
 
   include:
-    # In allowed failures
     - dist: bionic
       python: 3.9-dev
       env:
         - JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"
+
     - env:
         - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)"
 
@@ -42,7 +44,9 @@ matrix:
 
     - arch: arm64
       env:
-        - JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
+        - JOB="3.7, arm64" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
+      services:
+        - xvfb
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
@@ -71,12 +75,6 @@ before_install:
   - uname -a
   - git --version
   - ./ci/check_git_tags.sh
-  # Because travis runs on Google Cloud and has a /etc/boto.cfg,
-  # it breaks moto import, see:
-  # https://github.com/spulec/moto/issues/1771
-  # https://github.com/boto/boto/issues/3741
-  # This overrides travis and tells it to look nowhere.
-  - export BOTO_CONFIG=/dev/null
 
 install:
   - echo "install start"
diff --git a/ci/build39.sh b/ci/build39.sh
index f2ef11d5a71f4..faef2be03c2bb 100755
--- a/ci/build39.sh
+++ b/ci/build39.sh
@@ -1,7 +1,6 @@
 #!/bin/bash -e
 # Special build for python3.9 until numpy puts its own wheels up
 
-sudo apt-get install build-essential gcc xvfb
 pip install --no-deps -U pip wheel setuptools
 pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis
 
diff --git a/ci/setup_env.sh b/ci/setup_env.sh
index 961433204cfbb..4d08b10c7e76b 100755
--- a/ci/setup_env.sh
+++ b/ci/setup_env.sh
@@ -42,8 +42,6 @@ else
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-  sudo apt-get update
-  sudo apt-get -y install xvfb
   CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-0/Miniforge3-4.8.5-0-Linux-aarch64.sh"
 else
   CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
@@ -93,15 +91,13 @@ else
     echo "Not using ccache"
 fi
 
-echo "source deactivate"
-source deactivate
+echo "conda deactivate"
+conda deactivate
 
 echo "conda list (root environment)"
 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 pandas-dev
 
 echo
@@ -115,7 +111,7 @@ if [[ "$BITS32" == "yes" ]]; then
 fi
 
 echo "activate pandas-dev"
-source activate pandas-dev
+conda activate pandas-dev
 
 echo
 echo "remove any installed pandas package"
@@ -142,12 +138,6 @@ conda list pandas
 echo "[Build extensions]"
 python setup.py build_ext -q -i -j2
 
-# TODO: Some of our environments end up with old versions of pip (10.x)
-# Adding a new enough version of pip to the requirements explodes the
-# solve time. Just using pip to update itself.
-# - py35_macos
-# - py35_compat
-# - py36_32bit
 echo "[Updating pip]"
 python -m pip install --no-deps -U pip wheel setuptools
 

From 57f27242399a0b61e8977ea5076d33a3b2413588 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Sun, 20 Sep 2020 21:58:30 -0500
Subject: [PATCH 02/16] CI/CLN: update travis

---
 ci/setup_env.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/setup_env.sh b/ci/setup_env.sh
index 4d08b10c7e76b..036035931fb71 100755
--- a/ci/setup_env.sh
+++ b/ci/setup_env.sh
@@ -91,8 +91,8 @@ else
     echo "Not using ccache"
 fi
 
-echo "conda deactivate"
-conda deactivate
+echo "source deactivate"
+source deactivate
 
 echo "conda list (root environment)"
 conda list
@@ -111,7 +111,7 @@ if [[ "$BITS32" == "yes" ]]; then
 fi
 
 echo "activate pandas-dev"
-conda activate pandas-dev
+source activate pandas-dev
 
 echo
 echo "remove any installed pandas package"

From f8bbe13e176685eee3bc98b058cc78606bfc79eb Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Mon, 21 Sep 2020 09:35:59 -0500
Subject: [PATCH 03/16] CI: add xvfb

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d011c77fddb91..250179b036517 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,8 @@ matrix:
       python: 3.9-dev
       env:
         - JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"
+      services:
+        - xvfb
 
     - env:
         - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)"

From 5070708da850710512f54297b3b71e15dfdd8bea Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Mon, 21 Sep 2020 15:18:50 -0500
Subject: [PATCH 04/16] CI: fix arm64

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 250179b036517..24a74debe6b41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,6 @@ matrix:
     - arch: arm64
       env:
         - JOB="3.7, arm64" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
-      services:
-        - xvfb
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"

From fe0d7531c02318e3f7eab0615f9bfdb45acc5329 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Mon, 21 Sep 2020 16:43:03 -0500
Subject: [PATCH 05/16] CI: fix arm64

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 24a74debe6b41..250179b036517 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,8 @@ matrix:
     - arch: arm64
       env:
         - JOB="3.7, arm64" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
+      services:
+        - xvfb
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"

From 9a51899a21d00abea8fd25b8374729f6ae7d6e4f Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Mon, 21 Sep 2020 17:37:12 -0500
Subject: [PATCH 06/16] CI: fix arm64

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 250179b036517..938f98ff01a91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ python: 3.7
 addons:
   apt:
     update: true
+    packages:
+      - xvfb
 
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true

From 5d28234884948dbc17abb15ff45cfb26afded03d Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Mon, 21 Sep 2020 20:11:29 -0500
Subject: [PATCH 07/16] CI: fix arm64

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 938f98ff01a91..7c40200a78857 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,8 +49,6 @@ matrix:
     - arch: arm64
       env:
         - JOB="3.7, arm64" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
-      services:
-        - xvfb
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"

From 38cd65d8165ec633e40f4b686627f42dde1f058e Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 04:15:26 -0500
Subject: [PATCH 08/16] CI: fix arm64

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7c40200a78857..cee48bbb65247 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,7 @@ install:
 script:
   - echo "script start"
   - echo "$JOB"
-  - if [ "$JOB" != "3.9-dev" ]; then source activate pandas-dev; fi
+  - if [ "$JOB" != "3.9-dev" ]; then conda activate pandas-dev; fi
   - ci/run_tests.sh
 
 after_script:

From 271407cff6959062ef3ca23c202fb0e9d16e900e Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 04:38:34 -0500
Subject: [PATCH 09/16] CI: fix arm64

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cee48bbb65247..edb2dde985c76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,7 +88,6 @@ install:
 script:
   - echo "script start"
   - echo "$JOB"
-  - if [ "$JOB" != "3.9-dev" ]; then conda activate pandas-dev; fi
   - ci/run_tests.sh
 
 after_script:

From 8c679d5e4433a95a60da4b7f6a57a532e166603c Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 04:56:32 -0500
Subject: [PATCH 10/16] CI: fix arm64

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index edb2dde985c76..7c40200a78857 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -88,6 +88,7 @@ install:
 script:
   - echo "script start"
   - echo "$JOB"
+  - if [ "$JOB" != "3.9-dev" ]; then source activate pandas-dev; fi
   - ci/run_tests.sh
 
 after_script:

From de587a36a078200d84208fb2b24bab61a68df1c5 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 05:29:37 -0500
Subject: [PATCH 11/16] CI: fix arm64

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7c40200a78857..02a4d1f4e6526 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ addons:
     update: true
     packages:
       - xvfb
+      - xfonts-encodings
 
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true

From 81886a1a03d92af6a24e1ac40ce3389da0bf9f31 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 08:20:11 -0500
Subject: [PATCH 12/16] CI: fix arm64

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 02a4d1f4e6526..850a9ddc9a6df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ addons:
     update: true
     packages:
       - xvfb
-      - xfonts-encodings
+      - xfonts-base
 
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true

From 3e8833eb800050a6bb30b253fc11b4cbfae94e4d Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 14:15:59 -0500
Subject: [PATCH 13/16] CI: fix arm64

---
 .travis.yml     | 12 ++++++------
 ci/setup_env.sh |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 850a9ddc9a6df..6af035af12f40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: python
 python: 3.7
 
-addons:
-  apt:
-    update: true
-    packages:
-      - xvfb
-      - xfonts-base
+#addons:
+#  apt:
+#    update: true
+#    packages:
+#      - xvfb
+#      - xfonts-base
 
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true
diff --git a/ci/setup_env.sh b/ci/setup_env.sh
index 036035931fb71..8e9062bbb3771 100755
--- a/ci/setup_env.sh
+++ b/ci/setup_env.sh
@@ -42,7 +42,9 @@ else
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-  CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-0/Miniforge3-4.8.5-0-Linux-aarch64.sh"
+  sudo apt-get update
+  sudo apt-get -y install xvfb
+  CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-1/Miniforge3-4.8.5-1-Linux-aarch64.sh"
 else
   CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
 fi

From 5b476206397ff83fa3e37d5d9fcbf6509b964f75 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 15:01:26 -0500
Subject: [PATCH 14/16] CI: fix arm64

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6af035af12f40..fa052d68fb088 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ python: 3.7
 # travis cache --delete inside the project directory from the travis command line client
 # The cache directories will be deleted if anything in ci/ changes in a commit
 cache:
-  pip: true
   ccache: true
   directories:
     - $HOME/.cache # cython cache

From d2f7aa5c90b729af5974977bc6e57154d1aae304 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Tue, 22 Sep 2020 16:03:14 -0500
Subject: [PATCH 15/16] CI: fix arm64

---
 .travis.yml     | 13 ++++++-------
 ci/setup_env.sh |  2 --
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fa052d68fb088..0ede4fb0f3afb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,11 @@
 language: python
 python: 3.7
 
-#addons:
-#  apt:
-#    update: true
-#    packages:
-#      - xvfb
-#      - xfonts-base
+addons:
+  apt:
+    update: true
+    packages:
+      - xvfb
 
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true
@@ -48,7 +47,7 @@ matrix:
 
     - arch: arm64
       env:
-        - JOB="3.7, arm64" ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
+        - JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
diff --git a/ci/setup_env.sh b/ci/setup_env.sh
index 8e9062bbb3771..247f809c5fe63 100755
--- a/ci/setup_env.sh
+++ b/ci/setup_env.sh
@@ -42,8 +42,6 @@ else
 fi
 
 if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
-  sudo apt-get update
-  sudo apt-get -y install xvfb
   CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-1/Miniforge3-4.8.5-1-Linux-aarch64.sh"
 else
   CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"

From 2d3725fe239daae9f81e7aff3331b302b0795597 Mon Sep 17 00:00:00 2001
From: Fangchen Li <fangchen.li@outlook.com>
Date: Thu, 24 Sep 2020 09:14:55 -0500
Subject: [PATCH 16/16] CI: debug arm64 ci

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ede4fb0f3afb..81cd461dd2c87 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,9 @@ addons:
     packages:
       - xvfb
 
+services:
+  - xvfb
+
 # To turn off cached cython files and compiler cache
 # set NOCACHE-true
 # To delete caches go to https://travis-ci.org/OWNER/REPOSITORY/caches or run
@@ -36,8 +39,6 @@ matrix:
       python: 3.9-dev
       env:
         - JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"
-      services:
-        - xvfb
 
     - env:
         - JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)"
@@ -47,7 +48,7 @@ matrix:
 
     - arch: arm64
       env:
-        - JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
+        - JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
 
     - env:
         - JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"