From f1374877ae0c7b39ff1a5f7acef43ecb1b179cf8 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 09:31:42 -0700
Subject: [PATCH 01/18] CI: Add PyPy job

---
 azure-pipelines.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44f69a1..27fa422 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -68,6 +68,11 @@ jobs:
           NP_BUILD_DEP: "numpy==1.17.3"
           # pandas 1.4 requires py3.8+, remove this job on 1.4 release
           NIGHTLY_BUILD: "false"
+        pypy_3.7_64:
+          MB_PYTHON_VERSION: "pypy3.7-7.3.4"
+          NP_BUILD_DEP: "numpy==1.17.3"
+          # pandas 1.4 requires py3.8+, remove this job on 1.4 release
+          NIGHTLY_BUILD: "false"
         py_3.8_32:
           MB_PYTHON_VERSION: "3.8"
           PLAT: "i686"

From 19b31df70a69df7e8886a7c9946a94f37efa8e0a Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 14:55:48 -0700
Subject: [PATCH 02/18] Update posix.yml

---
 azure/posix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure/posix.yml b/azure/posix.yml
index 0cde32a..541849d 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -28,6 +28,7 @@ jobs:
       - task: UsePythonVersion@0
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
+        condition: not(contains('${{MB_PYTHON_VERSION}}', 'pypy'))
         displayName: Set python version
 
       - bash: |

From fe2971eec6b2429029b33eea67a087ce5ea6d237 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 15:02:17 -0700
Subject: [PATCH 03/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 541849d..6336599 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -28,7 +28,7 @@ jobs:
       - task: UsePythonVersion@0
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
-        condition: not(contains('${{MB_PYTHON_VERSION}}', 'pypy'))
+        condition: not(contains('$(MB_PYTHON_VERSION)', 'pypy'))
         displayName: Set python version
 
       - bash: |

From f766a80e1b6c487d6d0d965cca3791607a06544b Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 15:15:37 -0700
Subject: [PATCH 04/18] Update posix.yml

---
 azure/posix.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 6336599..9fae0a2 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -27,8 +27,11 @@ jobs:
 
       - task: UsePythonVersion@0
         inputs:
+        ${{ if not(contains($MB_PYTHON_VERSION, 'pypy'))}}:
           versionSpec: $(MB_PYTHON_VERSION)
-        condition: not(contains('$(MB_PYTHON_VERSION)', 'pypy'))
+        ${{ if contains($MB_PYTHON_VERSION, 'pypy')}}:
+          # Hard-code for now, doesn't really matter since multibuild will pull pypy itself
+          versionSpec: "3.7"
         displayName: Set python version
 
       - bash: |

From a14440916ce16cb780c74df2171f306cd5d40bd0 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:41:13 -0700
Subject: [PATCH 05/18] Update posix.yml

---
 azure/posix.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 9fae0a2..67c8d67 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -1,3 +1,9 @@
+variables:
+  ${{ if not(contains($(MB_PYTHON_VERSION), 'pypy'))}}:
+    AZURE_PYTHON_VERSION: $(MB_PYTHON_VERSION)
+  ${{ if contains($MB_PYTHON_VERSION, 'pypy')}}:
+    # Hard-code for now, doesn't really matter since multibuild will pull pypy itself
+    AZURE_PYTHON_VERSION: "3.7" 
 parameters:
   name: ""
   vmImage: ""
@@ -27,11 +33,7 @@ jobs:
 
       - task: UsePythonVersion@0
         inputs:
-        ${{ if not(contains($MB_PYTHON_VERSION, 'pypy'))}}:
-          versionSpec: $(MB_PYTHON_VERSION)
-        ${{ if contains($MB_PYTHON_VERSION, 'pypy')}}:
-          # Hard-code for now, doesn't really matter since multibuild will pull pypy itself
-          versionSpec: "3.7"
+          versionSpec: $(AZURE_PYTHON_VERSION)
         displayName: Set python version
 
       - bash: |

From dde30474fa66a03318bca0f1f2f835cc0e7d2ee5 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:44:39 -0700
Subject: [PATCH 06/18] Update posix.yml

---
 azure/posix.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 67c8d67..39f3086 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -1,9 +1,3 @@
-variables:
-  ${{ if not(contains($(MB_PYTHON_VERSION), 'pypy'))}}:
-    AZURE_PYTHON_VERSION: $(MB_PYTHON_VERSION)
-  ${{ if contains($MB_PYTHON_VERSION, 'pypy')}}:
-    # Hard-code for now, doesn't really matter since multibuild will pull pypy itself
-    AZURE_PYTHON_VERSION: "3.7" 
 parameters:
   name: ""
   vmImage: ""
@@ -33,8 +27,9 @@ jobs:
 
       - task: UsePythonVersion@0
         inputs:
-          versionSpec: $(AZURE_PYTHON_VERSION)
+          versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
+        condition: not(contains(variables["MB_PYTHON_VERSION"], 'pypy')
 
       - bash: |
           set -e

From ab66bb303e9312ee3600eb38de0c38d992ec73ee Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:45:20 -0700
Subject: [PATCH 07/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 39f3086..fd91093 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains(variables["MB_PYTHON_VERSION"], 'pypy')
+        condition: not(contains(variables["MB_PYTHON_VERSION"], 'pypy'))
 
       - bash: |
           set -e

From 4b9c019fbfe4388fda21a8d761a24ca150713c94 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Thu, 8 Jul 2021 21:20:09 -0700
Subject: [PATCH 08/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index fd91093..54f0f5f 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains(variables["MB_PYTHON_VERSION"], 'pypy'))
+        condition: not(contains($(MB_PYTHON_VERSION), "pypy"))
 
       - bash: |
           set -e

From 2701d72863aa3b0a711578adcd118905989138ff Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:05:26 -0700
Subject: [PATCH 09/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 54f0f5f..c5ef6fa 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains($(MB_PYTHON_VERSION), "pypy"))
+        condition: not(contains(${{variables.MB_PYTHON_VERSION}}, "pypy"))
 
       - bash: |
           set -e

From afca0dffced237d02a8dd73c564e176f8d08f2f5 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:10:46 -0700
Subject: [PATCH 10/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index c5ef6fa..7382823 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains(${{variables.MB_PYTHON_VERSION}}, "pypy"))
+        condition: not(contains(variables['MB_PYTHON_VERSION']}, "pypy"))
 
       - bash: |
           set -e

From 8ad5fdd56e5323c9df71f600377cf67abd0bceed Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:11:34 -0700
Subject: [PATCH 11/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 7382823..47ad02f 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains(variables['MB_PYTHON_VERSION']}, "pypy"))
+        condition: not(contains(variables['MB_PYTHON_VERSION'], "pypy"))
 
       - bash: |
           set -e

From 99d9f80b369a10b3ab775775a3166091f3f0ce26 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:12:40 -0700
Subject: [PATCH 12/18] Update posix.yml

---
 azure/posix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index 47ad02f..8800ed2 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -29,7 +29,7 @@ jobs:
         inputs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
-        condition: not(contains(variables['MB_PYTHON_VERSION'], "pypy"))
+        condition: not(contains(variables['MB_PYTHON_VERSION'], 'pypy'))
 
       - bash: |
           set -e

From 6da4756439e4fc0e2c0c09e14cb2b6e4aef0bd93 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 09:35:39 -0700
Subject: [PATCH 13/18] Update posix.yml

---
 azure/posix.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/azure/posix.yml b/azure/posix.yml
index 8800ed2..d3589eb 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -30,6 +30,12 @@ jobs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
         condition: not(contains(variables['MB_PYTHON_VERSION'], 'pypy'))
+        
+      - task: UsePythonVersion@0
+        inputs:
+          versionSpec: "3.7"
+        displayName: Set python version
+        condition: contains(variables['MB_PYTHON_VERSION'], 'pypy')
 
       - bash: |
           set -e

From a62d4b23ddc5d8ba659a86f79b0bce1bc592358a Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sat, 10 Jul 2021 17:20:40 +0000
Subject: [PATCH 14/18] Update multibuild

---
 multibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multibuild b/multibuild
index ec386ef..7684e52 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit ec386efaa9e6840b552d845dfc4d597f6b97a2b7
+Subproject commit 7684e52bcb023d511c4f17b638d497203f218a68

From f3e5184cca311e60fe2c19ad645dd5779698cd84 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 12 Jul 2021 17:17:21 -0700
Subject: [PATCH 15/18] Update azure-pipelines.yml

---
 azure-pipelines.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 27fa422..f90e7d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -69,7 +69,8 @@ jobs:
           # pandas 1.4 requires py3.8+, remove this job on 1.4 release
           NIGHTLY_BUILD: "false"
         pypy_3.7_64:
-          MB_PYTHON_VERSION: "pypy3.7-7.3.4"
+          MB_PYTHON_VERSION: "pypy3.7-7.3.5"
+          MB_ML_VER: "2014"
           NP_BUILD_DEP: "numpy==1.17.3"
           # pandas 1.4 requires py3.8+, remove this job on 1.4 release
           NIGHTLY_BUILD: "false"

From bb7a0237a909041bf0a7f7ad2ed000bd41e28f7d Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Mon, 12 Jul 2021 17:29:58 -0700
Subject: [PATCH 16/18] Clean

---
 azure/posix.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/azure/posix.yml b/azure/posix.yml
index d3589eb..8800ed2 100644
--- a/azure/posix.yml
+++ b/azure/posix.yml
@@ -30,12 +30,6 @@ jobs:
           versionSpec: $(MB_PYTHON_VERSION)
         displayName: Set python version
         condition: not(contains(variables['MB_PYTHON_VERSION'], 'pypy'))
-        
-      - task: UsePythonVersion@0
-        inputs:
-          versionSpec: "3.7"
-        displayName: Set python version
-        condition: contains(variables['MB_PYTHON_VERSION'], 'pypy')
 
       - bash: |
           set -e

From bb9a7620364589f4dc03a90338373ab85af6fac4 Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Tue, 13 Jul 2021 13:42:34 -0700
Subject: [PATCH 17/18] Update azure-pipelines.yml

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f90e7d9..3cb08ba 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -72,6 +72,7 @@ jobs:
           MB_PYTHON_VERSION: "pypy3.7-7.3.5"
           MB_ML_VER: "2014"
           NP_BUILD_DEP: "numpy==1.17.3"
+          BUILD_COMMIT: "1.3.x"
           # pandas 1.4 requires py3.8+, remove this job on 1.4 release
           NIGHTLY_BUILD: "false"
         py_3.8_32:

From 8a0c65d50efaec69b2894fb944098dedd5ede07d Mon Sep 17 00:00:00 2001
From: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Date: Sun, 25 Jul 2021 10:39:23 -0700
Subject: [PATCH 18/18] Update azure-pipelines.yml

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

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1cdee53..f2e0f74 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -74,7 +74,7 @@ jobs:
           MB_PYTHON_VERSION: "pypy3.7-7.3.5"
           MB_ML_VER: "2014"
           NP_BUILD_DEP: "numpy==1.17.3"
-          BUILD_COMMIT: "1.3.x"
+          DOCKER_TEST_IMAGE: multibuild/xenial_{PLAT}
           # pandas 1.4 requires py3.8+, remove this job on 1.4 release
           NIGHTLY_BUILD: "false"
         py_3.8_32: