cirrus: drop py2 on macos since brew did

  Homebrew provided a python@2 formula until the end of 2019, at which
  point it was removed due to the Python 2 deprecation.

  -- https://docs.brew.sh/Homebrew-and-Python

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/.cirrus.yml b/.cirrus.yml
index d676e7c3f6e6169f87ec04a264561fff806179c4..23948164c12aabeb9818f20c5b687b0190ca5466 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -107,18 +107,6 @@ task:
     dev/system-info
     gmake -j6 PYTHON=python3.7 check
 
-task:
-  name: macos (py2)
-  allow_failures: true
-  osx_instance:
-    image: catalina-base
-  script: |
-    set -xe
-    dev/prep-for-macos-build python2
-    export PKG_CONFIG_PATH=/usr/local/opt/readline/lib/pkgconfig
-    dev/system-info
-    make -j4 PYTHON=python2 check
-
 task:
   name: macos (py3)
   osx_instance:

diff --git a/dev/prep-for-macos-build b/dev/prep-for-macos-build
index 164a98b5473938e10e12a100634bf7d419b7c4af..e5594417cf63aa24e71bc70dd85775e8c7aa88c4 100755 (executable)
--- a/dev/prep-for-macos-build
+++ b/dev/prep-for-macos-build
@@ -27,7 +27,6 @@ case "$pyver" in
         ;;
     python3)
         brew install python
-        easy_install --user pip
         pip3 install --user pytest pytest-xdist
         ;;
     *)