From b1fa21888eab618f95a5b56771a470a024cc9df0 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:29:42 +0200
Subject: [PATCH 1/2] Add support for Python 3.10

---
 .github/workflows/build.yml | 12 ++++++------
 .github/workflows/tests.yml |  2 +-
 setup.py                    |  1 +
 tox.ini                     |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0d607cf1..d5e64cd6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,22 +15,22 @@ jobs:
     strategy:
       matrix:
         include:
-        - python-version: 3.7
+        - python-version: "3.7"
           env:
             TOXENV: docs
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: flake8
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: pylint
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: security
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: black
-        - python-version: 3.9
+        - python-version: "3.10"
           env:
             TOXENV: typing
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 643c2655..b7cf99b5 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/setup.py b/setup.py
index 743abe43..e0e8fe4d 100644
--- a/setup.py
+++ b/setup.py
@@ -23,6 +23,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Internet :: WWW/HTTP",
diff --git a/tox.ini b/tox.ini
index 4e8e4767..8d81dbf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, pypy, py35, py36, py37, py38, pypy3, docs, security, flake8, pylint, black
+envlist = py27, pypy, py35, py36, py37, py38, py39, py310, pypy3, docs, security, flake8, pylint, black
 
 [testenv]
 deps =

From dd2836cc4cd8f150560375ebba12a5aa91665c0c Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 9 Nov 2021 16:30:15 +0200
Subject: [PATCH 2/2] Drop the dot
 https://twitter.com/pytestdotorg/status/753767547866972160

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 8d81dbf9..a7c9ad2b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
     pytest !=3.1.1, !=3.1.2
     pytest-cov
 commands =
-    py.test \
+    pytest \
         --doctest-modules \
         --cov=w3lib --cov-report=term --cov-report=xml \
         {posargs:w3lib tests}