Merge branch 'master' into 3.9_for_windows

Author: altendky

.github/workflows/ci.yml

@@ -34,9 +34,10 @@ jobs:
               3.6: docker://python:3.6-buster
               3.7: docker://python:3.7-buster
               3.8: docker://python:3.8-buster
-              3.9: docker://python:3.9-rc-buster
-              pypy2: docker://pypy:2-jessie
-              pypy3: docker://pypy:3-stretch
+              3.9: docker://python:3.9-buster
+              pypy2.7: docker://pypy:2.7-buster
+              pypy3.6: docker://pypy:3.6-buster
+              pypy3.7: docker://pypy:3.7-buster
           - name: Windows
             runs-on: windows-latest
             python_platform: win32
@@ -49,41 +50,55 @@ jobs:
             action: 2.7
             docker: 2.7
             implementation: cpython
+            major: 2
           - name: CPython 3.5
             tox: py35
             action: 3.5
             docker: 3.5
             implementation: cpython
+            major: 3
           - name: CPython 3.6
             tox: py36
             action: 3.6
             docker: 3.6
             implementation: cpython
+            major: 3
           - name: CPython 3.7
             tox: py37
             action: 3.7
             docker: 3.7
             implementation: cpython
+            major: 3
           - name: CPython 3.8
             tox: py38
             action: 3.8
             docker: 3.8
             implementation: cpython
+            major: 3
           - name: CPython 3.9
             tox: py39
             action: 3.9
             docker: 3.9
             implementation: cpython
-          - name: PyPy 2
-            tox: pypy2
-            action: pypy2
-            docker: pypy2
+            major: 3
+          - name: PyPy 2.7
+            tox: pypy27
+            action: pypy-2.7
+            docker: pypy2.7
             implementation: pypy
-          - name: PyPy 3
-            tox: pypy3
-            action: pypy3
-            docker: pypy3
+            major: 2
+          - name: PyPy 3.6
+            tox: pypy36
+            action: pypy-3.6
+            docker: pypy3.6
             implementation: pypy
+            major: 3
+          - name: PyPy 3.7
+            tox: pypy37
+            action: pypy-3.7
+            docker: pypy3.7
+            implementation: pypy
+            major: 3
         reactor:
           - name: default
             tox: default
@@ -99,35 +114,23 @@ jobs:
             dependencies: asyncio
         exclude:
           - python:
-              tox: py27
+              major: 2
             reactor:
               tox: pyqt5
           - python:
-              tox: py27
+              major: 2
             reactor:
               tox: pyside2
           - python:
-              tox: py27
+              major: 2
             reactor:
               tox: asyncio
           - python:
-              tox: pypy2
-            reactor:
-              tox: asyncio
-          - python:
-              tox: pypy2
-            reactor:
-              tox: pyqt5
-          - python:
-              tox: pypy2
-            reactor:
-              tox: pyside2
-          - python:
-              tox: pypy3
+              implementation: pypy
             reactor:
               tox: pyqt5
           - python:
-              tox: pypy3
+              implementation: pypy
             reactor:
               tox: pyside2
     steps:

.travis.yml

@@ -4,7 +4,7 @@
 pytest-twisted - test twisted code with pytest
 ==============================================================================
 
-|PyPI| |Pythons| |Travis| |AppVeyor| |Black|
+|PyPI| |Pythons| |Travis| |AppVeyor| |Actions| |Black|
 
 :Authors: Ralf Schmitt, Kyle Altendorf, Victor Titor
 :Version: 1.13.2
@@ -229,6 +229,10 @@ v1.9
    :alt: AppVeyor build status
    :target: https://ci.appveyor.com/project/pytestbot/pytest-twisted
 
+.. |Actions| image:: https://img.shields.io/github/workflow/status/pytest-dev/pytest-twisted/CI/master?logo=GitHub-Actions
+   :alt: GitHub Actions build status
+   :target: https://github.com/pytest-dev/pytest-twisted/actions?query=branch%3Amaster
+
 .. |Black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
    :alt: Black code style
    :target: https://github.com/ambv/black

README.rst

@@ -1,7 +1,7 @@
 [tox]
 envlist=
-    py{27,py2,35,36,37,38,39,py3}-defaultreactor
-    py{35,36,37,38,39,py3}-asyncioreactor
+    py{27,py27,35,36,37,38,39,py36,py37}-defaultreactor
+    py{35,36,37,38,39,py36,py37}-asyncioreactor
     py{35,36,37,38,39}-pyqt5reactor
     py{35,36,37,38,39}-pyside2reactor
     linting