Merge branch 'master' into mypy

Author: madzak

.github/workflows/build.yml

@@ -1,20 +1,14 @@
 name: Test python-json-logger
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-  workflow_dispatch:
+on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        python-version: [pypy3, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
+        python-version: [pypy-3.6, pypy-3.7, pypy-3.8, 3.6, 3.7, 3.8, 3.9, 3.10.0-beta.4]
 
     steps:
       - uses: actions/checkout@v2

tox.ini

@@ -1,10 +1,11 @@
 [tox]
-envlist = pypy3, py35, py36, py37, py38, py39, py310
+envlist = pypy36, pypy37, pypy38, py36, py37, py38, py39, py310
 
 [gh-actions]
 python =
-  pypy-3: pypy3
-  3.5: py35
+  pypy-3.6: pypy36
+  pypy-3.7: pypy37
+  pypy-3.8: pypy38
   3.6: py36
   3.7: py37
   3.8: py38