From be3be0429db0393f92e987fcbd806737ecd28a60 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Thu, 14 Jan 2021 19:45:44 -0500
Subject: [PATCH] Backport PR #19301: Fix several CI issues

---
 .appveyor.yml       | 1 +
 azure-pipelines.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 668c5391de65..4321e1806dcb 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -18,6 +18,7 @@ environment:
     PYTHONIOENCODING: UTF-8
     PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
                  --cov-report= --cov=lib --log-level=DEBUG
+    PINNEDVERS: "pyzmq!=21.0.0"
 
   matrix:
     # In theory we could use a single CONDA_INSTALL_LOCN because we construct
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 91e510d27b52..e9af9c73850b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -81,7 +81,7 @@ steps:
         texlive-xetex texlive-luatex
       ;;
     darwin)
-      brew cask install xquartz
+      brew install --cask xquartz
       brew install pkg-config ffmpeg imagemagick mplayer ccache
       ;;
     win32)