Merge pull request #19305 from QuLogic/auto-backport-of-pr-19301-on-v3.3.x

QuLogic · web-flow · commit a9ff466ff440 · 2021-01-15T18:13:36.000-05:00
Backport PR #19301 on branch v3.3.x
diff --git 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
@@ -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)
