Merge branch 'master' into no_linuxbrew

.github/workflows/macos_build.yml

@@ -6,9 +6,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 2.7.18
-          - 3.5.10
-          - 3.6.15
           - 3.7.10
           - 3.8.10
           - 3.9.5

.github/workflows/pyenv_tests.yml

@@ -24,7 +24,12 @@ jobs:
               # xz-utils tk-dev libffi-dev liblzma-dev python-openssl git
       # https://github.com/pyenv/pyenv#installation
       - run: |
-          if test "$RUNNER_OS" == "macOS"; then brew install coreutils; fi
+          if test "$RUNNER_OS" == "macOS"; then
+            brew install coreutils fish
+          elif [[ $(lsb_release -sr | awk -F. '{print $1}') -ge 20 ]]; then
+            # Ubuntu 18 has fish 2 which lacks many features that facilitate testing
+            sudo apt install fish -yq
+          fi
       - run: pwd
       - env:
           PYENV_ROOT: /home/runner/work/pyenv/pyenv

.github/workflows/ubuntu_build.yml

@@ -6,9 +6,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          - 2.7.18
-          - 3.5.10
-          - 3.6.15
           - 3.7.10
           - 3.8.10
           - 3.9.5