CI: Modernize testing on PyPy

Drop support for PyPy 2 and PyPy 3.5. Add support for PyPy 3.6 - 3.8.

.travis.yml

@@ -20,10 +20,12 @@ matrix:
     - python: "3.9-dev"
       env: TOXENV=py39-dev
     # PyPy Environments
-    - python: "pypy2.7-6.0"
-      env: TOXENV=pypy
-    - python: "pypy3.5-7.0"
-      env: TOXENV=pypy3
+    - python: "pypy3.6-7.3.3"
+      env: TOXENV=pypy36
+    - python: "pypy3.7-7.3.9"
+      env: TOXENV=pypy37
+    - python: "pypy3.8-7.3.9"
+      env: TOXENV=pypy38
     # An extra environment where additional packages are not installed
     - python: "3.9"
       env:

all-plugin-requirements.txt

@@ -3,7 +3,7 @@
 #
 
 # Provides fcm:// and spush://
-cryptography
+cryptography<3.4
 
 # Provides growl:// support
 gntp

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,py39,py39-dev,pypy,pypy3,bare,coverage-report
+envlist = py36,py37,py38,py39,py39-dev,pypy36,pypy37,pypy38,bare,coverage-report
 
 
 [testenv]
@@ -79,25 +79,35 @@ commands =
     coverage run --parallel -m pytest {posargs}
     flake8 . --count --show-source --statistics
 
-[testenv:pypy]
+[testenv:pypy36]
 deps=
    -r{toxinidir}/requirements.txt
    -r{toxinidir}/dev-requirements.txt
    -r{toxinidir}/all-plugin-requirements.txt
 commands =
+    pip install --upgrade cryptography<3.4
     python setup.py compile_catalog
     coverage run --parallel -m pytest {posargs}
     flake8 . --count --show-source --statistics
 
-[testenv:pypy3]
+[testenv:pypy37]
 deps=
    -r{toxinidir}/requirements.txt
    -r{toxinidir}/dev-requirements.txt
    -r{toxinidir}/all-plugin-requirements.txt
-# Last supported cryptography version that can link against
-# OpenSSL v1.0.2 (which pypy35 uses) is 3.1.1
 commands =
-    pip install --upgrade cryptography==3.1.1
+    pip install --upgrade cryptography<3.4
+    python setup.py compile_catalog
+    coverage run --parallel -m pytest {posargs}
+    flake8 . --count --show-source --statistics
+
+[testenv:pypy38]
+deps=
+   -r{toxinidir}/requirements.txt
+   -r{toxinidir}/dev-requirements.txt
+   -r{toxinidir}/all-plugin-requirements.txt
+commands =
+    pip install --upgrade cryptography<3.4
     python setup.py compile_catalog
     coverage run --parallel -m pytest {posargs}
     flake8 . --count --show-source --statistics