Merge pull request #334 from hugovk/main

Author: nicoddemus

.github/workflows/main.yml

@@ -20,14 +20,15 @@ jobs:
       matrix:
         name: [
           "windows-py36",
-          "windows-py39",
+          "windows-py310",
           "windows-pypy3",
 
           "ubuntu-py36",
           "ubuntu-py36-pytestmain",
           "ubuntu-py37",
           "ubuntu-py38",
           "ubuntu-py39",
+          "ubuntu-py310",
           "ubuntu-pypy3",
           "ubuntu-benchmark",
 
@@ -40,10 +41,10 @@ jobs:
             python: "3.6"
             os: windows-latest
             tox_env: "py36"
-          - name: "windows-py39"
-            python: "3.9"
+          - name: "windows-py310"
+            python: "3.10"
             os: windows-latest
-            tox_env: "py39"
+            tox_env: "py310"
           - name: "windows-pypy3"
             python: "pypy3"
             os: windows-latest
@@ -73,6 +74,11 @@ jobs:
             os: ubuntu-latest
             tox_env: "py39"
             use_coverage: true
+          - name: "ubuntu-py310"
+            python: "3.10"
+            os: ubuntu-latest
+            tox_env: "py310"
+            use_coverage: true
           - name: "ubuntu-pypy3"
             python: "pypy3"
             os: ubuntu-latest

setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal=1
-
 [metadata]
 name = pluggy
 description = plugin and hook calling mechanisms for python
@@ -29,6 +26,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
 
 [options]
 packages =

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=linting,docs,py{36,37,38,39,py3},py{36,37}-pytest{main}
+envlist=linting,docs,py{36,37,38,39,310,py3},py{36,37}-pytest{main}
 
 [testenv]
 commands=