Merge branch 'master' into os_icons

Author: altendky

.github/local-problem-matchers.json

@@ -0,0 +1,28 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "local-generic-warning",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.*\\bWARNING:\\b.*)$",
+                    "message": 1
+                }
+            ]
+        },
+        {
+            "owner": "local-tox-not_in_env_warning",
+            "severity": "error",
+            "pattern": [
+                {
+                    "regexp": "^(\\s*WARNING: test command found but not installed.*)$"
+                },
+                {
+                    "regexp": "^(\\s*(cmd:|env:|Maybe you forgot).*)$",
+                    "message": 1,
+                    "loop": true
+                }
+            ]
+        }
+    ]
+}

.github/workflows/ci.yml

@@ -31,6 +31,8 @@ jobs:
               3.6: docker://python:3.6-buster
               3.7: docker://python:3.7-buster
               3.8: docker://python:3.8-buster
+              pypy2: docker://pypy:2-jessie
+              pypy3: docker://pypy:3-stretch
           - name: 🪟
             runs-on: windows-latest
             python_platform: win32
@@ -58,6 +60,14 @@ jobs:
             tox: py38
             action: 3.8
             docker: 3.8
+          - name: PyPy 2
+            tox: pypy2
+            action: pypy2
+            docker: pypy2
+          - name: PyPy 3
+            tox: pypy3
+            action: pypy3
+            docker: pypy3
         reactor:
           - name: default
             tox: default
@@ -77,8 +87,23 @@ jobs:
               tox: py27
             reactor:
               tox: asyncio
+          - python:
+              tox: pypy2
+            reactor:
+              tox: asyncio
+          - python:
+              tox: pypy2
+            reactor:
+              tox: qt5
+          - python:
+              tox: pypy3
+            reactor:
+              tox: qt5
     steps:
       - uses: actions/checkout@v2
+      - name: Enable Problem Matchers
+        run: |
+          echo "::add-matcher::.github/local-problem-matchers.json"
       - name: Set up ${{ matrix.python.name }}
         if: ${{ job.container == '' }}
         uses: actions/setup-python@v2

setup.py

@@ -30,6 +30,8 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
     ],
     entry_points={"pytest11": ["twisted = pytest_twisted"]},
 )

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist=
-    py27-defaultreactor
-    py{35,36,37,38}-{default,qt5,asyncio}reactor
+    py{27,py2,35,36,37,38,py3}-defaultreactor
+    py{35,36,37,38,py3}-asyncioreactor
     py{35,36,37,38}-qt5reactor
     linting
 
@@ -10,11 +10,11 @@ deps=
     greenlet
     pytest
     twisted
-    pywin32; sys_platform == 'win32'
     qt5reactor: pytest-qt
     qt5reactor: qt5reactor
     qt5reactor: pytest-xvfb
     qt5reactor: pyqt5
+    qt5reactor: pywin32; sys_platform == 'win32'
 setenv=
     defaultreactor: REACTOR = default
     qt5reactor: REACTOR = qt5reactor