Install PyPy using actions/setup-python.

.github/workflows/tests-ubuntu.yml

@@ -26,10 +26,9 @@ jobs:
         - python-version: "3.11.0-rc.2"
           env:
             TOXENV: asyncio
-        - python-version: pypy3
+        - python-version: pypy3.9
           env:
             TOXENV: pypy3
-            PYPY_VERSION: 3.9-v7.3.9
 
         # pinned deps
         - python-version: 3.7.13
@@ -38,10 +37,9 @@ jobs:
         - python-version: 3.7.13
           env:
             TOXENV: asyncio-pinned
-        - python-version: pypy3
+        - python-version: pypy3.7
           env:
             TOXENV: pypy3-pinned
-            PYPY_VERSION: 3.7-v7.3.5
 
         # extras
         # extra-deps includes reppy, which does not support Python 3.9
@@ -59,7 +57,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Install system libraries
-      if: matrix.python-version == 'pypy3' || contains(matrix.env.TOXENV, 'pinned') || matrix.python-version == '3.11.0-rc.2'
+      if: matrix.python-version == 'pypy3.9' || contains(matrix.env.TOXENV, 'pinned') || matrix.python-version == '3.11.0-rc.2'
       run: |
         sudo apt-get update
         # libxml2 2.9.12 from ondrej/php PPA breaks lxml so we pin it to the bionic-updates repo version
@@ -68,13 +66,6 @@ jobs:
     - name: Run tests
       env: ${{ matrix.env }}
       run: |
-        if [[ ! -z "$PYPY_VERSION" ]]; then
-          export PYPY_VERSION="pypy$PYPY_VERSION-linux64"
-          wget "https://downloads.python.org/pypy/${PYPY_VERSION}.tar.bz2"
-          tar -jxf ${PYPY_VERSION}.tar.bz2
-          $PYPY_VERSION/bin/pypy3 -m venv "$HOME/virtualenvs/$PYPY_VERSION"
-          source "$HOME/virtualenvs/$PYPY_VERSION/bin/activate"
-        fi
         pip install -U tox
         tox