From cfef3488e94ff4b86cfd188b86fb7678d083354f Mon Sep 17 00:00:00 2001
From: Alexei Andrushievich <vint21h@vint21h.pp.ua>
Date: Tue, 29 Sep 2020 03:16:21 +0300
Subject: [PATCH 1/5] Fixed broken test PyPI token usage example repository URL
 (#8618)

* Fixed broken test PyPI token usage example repository URL

* Renamed 'site_url' to 'upload_url' variable in token management template

* Transalations rebuild
---
 warehouse/locale/messages.pot         | 74 +++++++++++++--------------
 warehouse/templates/manage/token.html |  4 +-
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/warehouse/locale/messages.pot b/warehouse/locale/messages.pot
index b7098559a06b..bc9b070ec346 100644
--- a/warehouse/locale/messages.pot
+++ b/warehouse/locale/messages.pot
@@ -850,8 +850,8 @@ msgstr ""
 #: warehouse/templates/manage/account/webauthn-provision.html:44
 #: warehouse/templates/manage/roles.html:153
 #: warehouse/templates/manage/roles.html:165
-#: warehouse/templates/manage/token.html:134
-#: warehouse/templates/manage/token.html:151
+#: warehouse/templates/manage/token.html:136
+#: warehouse/templates/manage/token.html:153
 #: warehouse/templates/re-auth.html:51
 msgid "(required)"
 msgstr ""
@@ -1800,7 +1800,7 @@ msgstr ""
 
 #: warehouse/templates/manage/account.html:167
 #: warehouse/templates/manage/account.html:530
-#: warehouse/templates/manage/token.html:149
+#: warehouse/templates/manage/token.html:151
 msgid "Scope"
 msgstr ""
 
@@ -1827,7 +1827,7 @@ msgid "View token options"
 msgstr ""
 
 #: warehouse/templates/manage/account.html:196
-#: warehouse/templates/manage/token.html:55
+#: warehouse/templates/manage/token.html:57
 msgid "Remove token"
 msgstr ""
 
@@ -1837,13 +1837,13 @@ msgstr ""
 
 #: warehouse/templates/manage/account.html:210
 #: warehouse/templates/manage/account.html:212
-#: warehouse/templates/manage/token.html:58
-#: warehouse/templates/manage/token.html:59
+#: warehouse/templates/manage/token.html:60
+#: warehouse/templates/manage/token.html:61
 msgid "Remove API token"
 msgstr ""
 
 #: warehouse/templates/manage/account.html:217
-#: warehouse/templates/manage/token.html:64
+#: warehouse/templates/manage/token.html:66
 msgid ""
 "Applications or scripts using this token will no longer have access to "
 "PyPI."
@@ -2310,7 +2310,7 @@ msgid ""
 msgstr ""
 
 #: warehouse/templates/manage/account.html:737
-#: warehouse/templates/manage/token.html:167
+#: warehouse/templates/manage/token.html:169
 msgid "Proceed with caution!"
 msgstr ""
 
@@ -3113,70 +3113,70 @@ msgstr ""
 msgid "Project Name"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:36
+#: warehouse/templates/manage/token.html:38
 #, python-format
 msgid "Token for \"%(macaroon_description)s\""
 msgstr ""
 
-#: warehouse/templates/manage/token.html:38
+#: warehouse/templates/manage/token.html:40
 msgid "Permissions:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:38
-#: warehouse/templates/manage/token.html:145
+#: warehouse/templates/manage/token.html:40
+#: warehouse/templates/manage/token.html:147
 msgid "Upload packages"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:40
 #: warehouse/templates/manage/token.html:42
+#: warehouse/templates/manage/token.html:44
 msgid "Scope:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:40
-#: warehouse/templates/manage/token.html:156
+#: warehouse/templates/manage/token.html:42
+#: warehouse/templates/manage/token.html:158
 msgid "Entire account (all projects)"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:42
+#: warehouse/templates/manage/token.html:44
 #, python-format
 msgid "Project \"%(project)s\""
 msgstr ""
 
-#: warehouse/templates/manage/token.html:49
+#: warehouse/templates/manage/token.html:51
 msgid ""
 "For security reasons this token will only appear once. <strong>Copy it "
 "now.</strong>"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:51
+#: warehouse/templates/manage/token.html:53
 msgid "Copy token to clipboard"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:52
+#: warehouse/templates/manage/token.html:54
 msgid "Copy token"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:70
+#: warehouse/templates/manage/token.html:72
 msgid "Using this token"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:72
+#: warehouse/templates/manage/token.html:74
 msgid "To use this API token:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:75
+#: warehouse/templates/manage/token.html:77
 #, python-format
 msgid "Set your username to <code>%(token)s</code>"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:76
+#: warehouse/templates/manage/token.html:78
 #, python-format
 msgid ""
 "Set your password to the token value, including the "
 "<code>%(prefix)s</code> prefix"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:82
+#: warehouse/templates/manage/token.html:84
 #, python-format
 msgid ""
 "For example, if you are using <a href=\"%(href)s\">Twine</a> to upload "
@@ -3184,7 +3184,7 @@ msgid ""
 "this:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:92
+#: warehouse/templates/manage/token.html:94
 #, python-format
 msgid ""
 "For example, if you are using <a href=\"%(href)s\">Twine</a> to upload "
@@ -3192,61 +3192,61 @@ msgid ""
 "file like this:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:104
+#: warehouse/templates/manage/token.html:106
 msgid ""
 "either a user-scoped token or a project-scoped token you want to set as "
 "the default"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:109
+#: warehouse/templates/manage/token.html:111
 msgid "a project token"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:111
+#: warehouse/templates/manage/token.html:113
 #, python-format
 msgid ""
 "You can then use <code>%(command)s</code> to switch to the correct token "
 "when uploading to PyPI."
 msgstr ""
 
-#: warehouse/templates/manage/token.html:117
+#: warehouse/templates/manage/token.html:119
 #, python-format
 msgid ""
 "For further instructions on how to use this token, <a "
 "href=\"%(href)s\">visit the PyPI help page</a>."
 msgstr ""
 
-#: warehouse/templates/manage/token.html:125
+#: warehouse/templates/manage/token.html:127
 msgid "Add another token"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:132
+#: warehouse/templates/manage/token.html:134
 msgid "Token name"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:141
+#: warehouse/templates/manage/token.html:143
 msgid "What is this token for?"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:144
+#: warehouse/templates/manage/token.html:146
 msgid "Permissions"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:155
+#: warehouse/templates/manage/token.html:157
 msgid "Select scope..."
 msgstr ""
 
-#: warehouse/templates/manage/token.html:159
+#: warehouse/templates/manage/token.html:161
 msgid "Project:"
 msgstr ""
 
-#: warehouse/templates/manage/token.html:168
+#: warehouse/templates/manage/token.html:170
 msgid ""
 "An API token scoped to your entire account will have upload permissions "
 "for all of your current and future projects."
 msgstr ""
 
-#: warehouse/templates/manage/token.html:171
+#: warehouse/templates/manage/token.html:173
 msgid "Add token"
 msgstr ""
 
diff --git a/warehouse/templates/manage/token.html b/warehouse/templates/manage/token.html
index b58a8f088e3d..a3434d17ad38 100644
--- a/warehouse/templates/manage/token.html
+++ b/warehouse/templates/manage/token.html
@@ -26,8 +26,10 @@
 {% block main %}
   {% if testPyPI %}
     {% set site = "testpypi" %}
+    {% set upload_url = "https://test.pypi.org/legacy/" %}
   {% else %}
     {% set site = "pypi" %}
+    {% set upload_url = "https://upload.pypi.org/legacy/" %}
   {% endif %}
   <h1 class="page-title">{{ title }}</h1>
 
@@ -104,7 +106,7 @@ <h2>{% trans %}Using this token{% endtrans %}</h2>
   password = # {% trans %}either a user-scoped token or a project-scoped token you want to set as the default{% endtrans %}
 
 [PROJECT_NAME]
-  repository = https://upload.{{ site }}.org/legacy/
+  repository = {{ upload_url }}
   username = __token__
   password = # {% trans %}a project token{% endtrans %} </pre>
     <p>

From f14d37846bf8bacb15f95ea760b5d08556eec91f Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 29 Sep 2020 12:06:56 -0500
Subject: [PATCH 2/5] Remove undeclared dependency on attrs (#8624)

---
 tests/unit/email/test_init.py | 695 +++++++++++++++-------------------
 warehouse/email/__init__.py   |   8 +-
 warehouse/email/services.py   |  10 +-
 3 files changed, 321 insertions(+), 392 deletions(-)

diff --git a/tests/unit/email/test_init.py b/tests/unit/email/test_init.py
index f44adbc4f79c..2ac7d2f92baa 100644
--- a/tests/unit/email/test_init.py
+++ b/tests/unit/email/test_init.py
@@ -12,7 +12,6 @@
 
 import datetime
 
-import attr
 import celery.exceptions
 import pretend
 import pytest
@@ -276,7 +275,11 @@ def record_event(self, user_id, tag, ip_address, additional):
             task,
             request,
             "recipient",
-            attr.asdict(msg),
+            {
+                "subject": msg.subject,
+                "body_text": msg.body_text,
+                "body_html": msg.body_html,
+            },
             {
                 "tag": "account:email:sent",
                 "user_id": user_id,
@@ -339,7 +342,11 @@ def retry(exc):
                 task,
                 request,
                 "recipient",
-                attr.asdict(msg),
+                {
+                    "subject": msg.subject,
+                    "body_text": msg.body_text,
+                    "body_html": msg.body_html,
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": user_id,
@@ -455,16 +462,14 @@ def test_send_password_reset_email(
                 "name_value <"
                 + (stub_user.email if email_addr is None else email_addr)
                 + ">",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -548,16 +553,14 @@ def test_email_verification_email(
         assert send_email.delay.calls == [
             pretend.call(
                 stub_email.email,
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -621,16 +624,14 @@ def test_password_change_email(self, pyramid_request, pyramid_config, monkeypatc
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.username} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -741,16 +742,14 @@ def test_password_compromised_email_hibp(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.username} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -814,16 +813,14 @@ def test_password_compromised_email(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.username} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -888,16 +885,14 @@ def test_account_deletion_email(self, pyramid_request, pyramid_config, monkeypat
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.username} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -1016,16 +1011,14 @@ def test_primary_email_change_email(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <old_email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -1176,16 +1169,14 @@ def test_collaborator_added_email(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -1200,16 +1191,14 @@ def test_collaborator_added_email(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -1302,16 +1291,14 @@ def test_collaborator_added_email_unverified(
         assert send_email.delay.calls == [
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -1387,16 +1374,14 @@ def test_project_role_verification_email(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.name} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -1481,16 +1466,14 @@ def test_added_as_collaborator_email(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -1630,16 +1613,14 @@ def test_collaborator_removed_email(self, db_request, pyramid_config, monkeypatc
         assert send_email.delay.calls == [
             pretend.call(
                 f"{ removed_user.name } <{ removed_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": removed_user.id,
@@ -1654,16 +1635,14 @@ def test_collaborator_removed_email(self, db_request, pyramid_config, monkeypatc
             ),
             pretend.call(
                 f"{ submitter_user.name } <{ submitter_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": submitter_user.id,
@@ -1731,16 +1710,14 @@ def test_removed_as_collaborator_email(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{ removed_user.name } <{ removed_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": removed_user.id,
@@ -1817,16 +1794,14 @@ def test_role_changed_email(self, db_request, pyramid_config, monkeypatch):
         assert send_email.delay.calls == [
             pretend.call(
                 f"{ changed_user.name } <{ changed_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": changed_user.id,
@@ -1841,16 +1816,14 @@ def test_role_changed_email(self, db_request, pyramid_config, monkeypatch):
             ),
             pretend.call(
                 f"{ submitter_user.name } <{ submitter_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": submitter_user.id,
@@ -1922,16 +1895,14 @@ def test_role_changed_as_collaborator_email(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{ changed_user.name } <{ changed_user.primary_email.email }>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": changed_user.id,
@@ -2027,16 +1998,14 @@ def test_removed_project_email_to_maintainer(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2051,16 +2020,14 @@ def test_removed_project_email_to_maintainer(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2154,16 +2121,14 @@ def test_removed_project_email_to_owner(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2178,16 +2143,14 @@ def test_removed_project_email_to_owner(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2297,16 +2260,14 @@ def test_send_yanked_project_release_email_to_maintainer(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2321,16 +2282,14 @@ def test_send_yanked_project_release_email_to_maintainer(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2438,16 +2397,14 @@ def test_send_yanked_project_release_email_to_owner(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2462,16 +2419,14 @@ def test_send_yanked_project_release_email_to_owner(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2580,16 +2535,14 @@ def test_send_unyanked_project_release_email_to_maintainer(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2604,16 +2557,14 @@ def test_send_unyanked_project_release_email_to_maintainer(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2720,16 +2671,14 @@ def test_send_unyanked_project_release_email_to_owner(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2744,16 +2693,14 @@ def test_send_unyanked_project_release_email_to_owner(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -2862,16 +2809,14 @@ def test_send_removed_project_release_email_to_maintainer(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -2886,16 +2831,14 @@ def test_send_removed_project_release_email_to_maintainer(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -3002,16 +2945,14 @@ def test_send_removed_project_release_email_to_owner(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -3026,16 +2967,14 @@ def test_send_removed_project_release_email_to_owner(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -3145,16 +3084,14 @@ def test_send_removed_project_release_file_email_to_owner(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -3169,16 +3106,14 @@ def test_send_removed_project_release_file_email_to_owner(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -3286,16 +3221,14 @@ def test_send_removed_project_release_file_email_to_maintainer(
         assert send_email.delay.calls == [
             pretend.call(
                 "username <email@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
                     ),
-                ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
@@ -3310,16 +3243,14 @@ def test_send_removed_project_release_file_email_to_maintainer(
             ),
             pretend.call(
                 "submitterusername <submiteremail@example.com>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_submitter_user.id,
@@ -3401,16 +3332,14 @@ def test_two_factor_email(
         assert send_email.delay.calls == [
             pretend.call(
                 f"{stub_user.username} <{stub_user.email}>",
-                attr.asdict(
-                    EmailMessage(
-                        subject="Email Subject",
-                        body_text="Email Body",
-                        body_html=(
-                            "<html>\n<head></head>\n"
-                            "<body><p>Email HTML Body</p></body>\n</html>\n"
-                        ),
-                    )
-                ),
+                {
+                    "subject": "Email Subject",
+                    "body_text": "Email Body",
+                    "body_html": (
+                        "<html>\n<head></head>\n"
+                        "<body><p>Email HTML Body</p></body>\n</html>\n"
+                    ),
+                },
                 {
                     "tag": "account:email:sent",
                     "user_id": stub_user.id,
diff --git a/warehouse/email/__init__.py b/warehouse/email/__init__.py
index 385295153ee7..04d518434f37 100644
--- a/warehouse/email/__init__.py
+++ b/warehouse/email/__init__.py
@@ -14,8 +14,6 @@
 
 from email.headerregistry import Address
 
-import attr
-
 from celery.schedules import crontab
 from first import first
 
@@ -69,7 +67,11 @@ def _send_email_to_user(request, user, msg, *, email=None, allow_unverified=Fals
 
     request.task(send_email).delay(
         _compute_recipient(user, email.email),
-        attr.asdict(msg),
+        {
+            "subject": msg.subject,
+            "body_text": msg.body_text,
+            "body_html": msg.body_html,
+        },
         {
             "tag": "account:email:sent",
             "user_id": user.id,
diff --git a/warehouse/email/services.py b/warehouse/email/services.py
index e2b3487f30ab..5ba094ca0dc7 100644
--- a/warehouse/email/services.py
+++ b/warehouse/email/services.py
@@ -15,7 +15,6 @@
 from email.utils import parseaddr
 from typing import Optional
 
-import attr
 import premailer
 
 from jinja2.exceptions import TemplateNotFound
@@ -33,12 +32,11 @@ def _format_sender(sitename, sender):
         return str(Address(sitename, addr_spec=sender))
 
 
-@attr.s(auto_attribs=True, frozen=True, slots=True)
 class EmailMessage:
-
-    subject: str
-    body_text: str
-    body_html: Optional[str] = None
+    def __init__(self, subject: str, body_text: str, body_html: Optional[str] = None):
+        self.subject = subject
+        self.body_text = body_text
+        self.body_html = body_html
 
     @classmethod
     def from_template(cls, email_name, context, *, request):

From 4774aee21f41fe1ffe0e2bf22440666494acbcad Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 29 Sep 2020 12:25:02 -0500
Subject: [PATCH 3/5] Bring RTD reqs inline with our other reqs files (#8625)

---
 .readthedocs.yml      | 11 +++++++++++
 docs/requirements.txt |  2 --
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 .readthedocs.yml
 delete mode 100644 docs/requirements.txt

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 000000000000..035b08f2fda3
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,11 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Change the default requirements file
+python:
+  install:
+    - requirements: requirements/docs.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
deleted file mode 100644
index 805b4141fb76..000000000000
--- a/docs/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-sphinx==1.8.2
-sphinxcontrib-httpdomain==1.7.0

From 8a83c0bb2a12fe3356c1f68d1dcf953a89a2bbfc Mon Sep 17 00:00:00 2001
From: Dustin Ingram <di@users.noreply.github.com>
Date: Tue, 29 Sep 2020 14:22:15 -0500
Subject: [PATCH 4/5] Dependency upgrades (#8626)

* Bump alembic from 1.4.2 to 1.4.3

Bumps [alembic](https://github.com/sqlalchemy/alembic) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/sqlalchemy/alembic/releases)
- [Changelog](https://github.com/sqlalchemy/alembic/blob/master/CHANGES)
- [Commits](https://github.com/sqlalchemy/alembic/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump stevedore from 3.2.1 to 3.2.2

Bumps [stevedore](https://docs.openstack.org/stevedore/latest/) from 3.2.1 to 3.2.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump coverage from 5.2.1 to 5.3

Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.2.1 to 5.3.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.2.1...coverage-5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump faker from 4.1.2 to 4.1.3

Bumps [faker](https://github.com/joke2k/faker) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/joke2k/faker/releases)
- [Changelog](https://github.com/joke2k/faker/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/joke2k/faker/compare/v4.1.2...v4.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump pygments from 2.6.1 to 2.7.1

Bumps [pygments](https://github.com/pygments/pygments) from 2.6.1 to 2.7.1.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.6.1...2.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump pytest-postgresql from 2.4.1 to 2.5.0

Bumps [pytest-postgresql](https://github.com/ClearcodeHQ/pytest-postgresql) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/ClearcodeHQ/pytest-postgresql/releases)
- [Changelog](https://github.com/ClearcodeHQ/pytest-postgresql/blob/master/CHANGES.rst)
- [Commits](https://github.com/ClearcodeHQ/pytest-postgresql/compare/v2.4.1...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump bleach from 3.1.5 to 3.2.1

Bumps [bleach](https://github.com/mozilla/bleach) from 3.1.5 to 3.2.1.
- [Release notes](https://github.com/mozilla/bleach/releases)
- [Changelog](https://github.com/mozilla/bleach/blob/master/CHANGES)
- [Commits](https://github.com/mozilla/bleach/compare/v3.1.5...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump isort from 5.5.2 to 5.5.3

Bumps [isort](https://github.com/pycqa/isort) from 5.5.2 to 5.5.3.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.5.2...5.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump cffi from 1.14.2 to 1.14.3

Bumps [cffi](https://github.com/python-cffi/release-doc) from 1.14.2 to 1.14.3.
- [Release notes](https://github.com/python-cffi/release-doc/releases)
- [Commits](https://github.com/python-cffi/release-doc/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump google-cloud-bigquery from 1.27.2 to 1.28.0

Bumps [google-cloud-bigquery](https://github.com/googleapis/python-bigquery) from 1.27.2 to 1.28.0.
- [Release notes](https://github.com/googleapis/python-bigquery/releases)
- [Changelog](https://github.com/googleapis/python-bigquery/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/python-bigquery/compare/v1.27.2...v1.28.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump cryptography from 3.1 to 3.1.1

Bumps [cryptography](https://github.com/pyca/cryptography) from 3.1 to 3.1.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/3.1...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump google-cloud-storage from 1.31.0 to 1.31.2

Bumps [google-cloud-storage](https://github.com/googleapis/python-storage) from 1.31.0 to 1.31.2.
- [Release notes](https://github.com/googleapis/python-storage/releases)
- [Changelog](https://github.com/googleapis/python-storage/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/python-storage/compare/v1.31.0...v1.31.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump sentry-sdk from 0.17.4 to 0.17.8

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 0.17.4 to 0.17.8.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGES.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/0.17.4...0.17.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump trove-classifiers from 2020.9.8 to 2020.9.25

Bumps [trove-classifiers](https://github.com/pypa/trove-classifiers) from 2020.9.8 to 2020.9.25.
- [Release notes](https://github.com/pypa/trove-classifiers/releases)
- [Commits](https://github.com/pypa/trove-classifiers/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump beautifulsoup4 from 4.9.1 to 4.9.2

Bumps [beautifulsoup4](http://www.crummy.com/software/BeautifulSoup/bs4/) from 4.9.1 to 4.9.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump pytest from 6.0.1 to 6.1.0

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.0.1...6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump regex from 2020.7.14 to 2020.9.27

Bumps [regex](https://bitbucket.org/mrabarnett/mrab-regex) from 2020.7.14 to 2020.9.27.
- [Commits](https://bitbucket.org/mrabarnett/mrab-regex/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump google-auth from 1.21.1 to 1.22.0

Bumps [google-auth](https://github.com/googleapis/google-auth-library-python) from 1.21.1 to 1.22.0.
- [Release notes](https://github.com/googleapis/google-auth-library-python/releases)
- [Changelog](https://github.com/googleapis/google-auth-library-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-auth-library-python/compare/v1.21.1...v1.22.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump requests-aws4auth from 1.0 to 1.0.1

Bumps [requests-aws4auth](https://github.com/tedder/requests-aws4auth) from 1.0 to 1.0.1.
- [Release notes](https://github.com/tedder/requests-aws4auth/releases)
- [Changelog](https://github.com/tedder/requests-aws4auth/blob/master/HISTORY.md)
- [Commits](https://github.com/tedder/requests-aws4auth/compare/v1.0...v1.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump boto3 from 1.14.47 to 1.15.7

Bumps [boto3](https://github.com/boto/boto3) from 1.14.47 to 1.15.7.
- [Release notes](https://github.com/boto/boto3/releases)
- [Changelog](https://github.com/boto/boto3/blob/develop/CHANGELOG.rst)
- [Commits](https://github.com/boto/boto3/compare/1.14.47...1.15.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Pin back celery<5

* Add missing hashes

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 requirements/docs.txt  |   6 +-
 requirements/lint.txt  |  62 +++++-----
 requirements/main.in   |   2 +-
 requirements/main.txt  | 260 ++++++++++++++++++++++++++---------------
 requirements/tests.txt |  98 ++++++++--------
 5 files changed, 249 insertions(+), 179 deletions(-)

diff --git a/requirements/docs.txt b/requirements/docs.txt
index 47a8ed101a5c..38762dc8e6a7 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -76,9 +76,9 @@ packaging==20.4 \
     --hash=sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 \
     --hash=sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181 \
     # via sphinx
-pygments==2.6.1 \
-    --hash=sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44 \
-    --hash=sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324 \
+pygments==2.7.1 \
+    --hash=sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998 \
+    --hash=sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7 \
     # via sphinx
 pyparsing==2.4.7 \
     --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \
diff --git a/requirements/lint.txt b/requirements/lint.txt
index 9e21c205f7fe..e4d458f7116f 100644
--- a/requirements/lint.txt
+++ b/requirements/lint.txt
@@ -45,9 +45,9 @@ flake8==3.8.3 \
     --hash=sha256:15e351d19611c887e482fb960eae4d44845013cc142d42896e9862f775d8cf5c \
     --hash=sha256:f04b9fcbac03b0a3e58c0ab3a0ecc462e023a9faf046d57794184028123aa208 \
     # via -r requirements/lint.in, flake8-polyfill
-isort==5.5.2 \
-    --hash=sha256:171c5f365791073426b5ed3a156c2081a47f88c329161fd28228ff2da4c97ddb \
-    --hash=sha256:ba91218eee31f1e300ecc079ef0c524cea3fc41bfbb979cbdf5fd3a889e3cfed \
+isort==5.5.3 \
+    --hash=sha256:6187a9f1ce8784cbc6d1b88790a43e6083a6302f03e9ae482acc0f232a98c843 \
+    --hash=sha256:c16eaa7432a1c004c585d79b12ad080c6c421dd18fe27982ca11f95e6898e432 \
     # via -r requirements/lint.in
 mccabe==0.6.1 \
     --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \
@@ -81,32 +81,32 @@ pyflakes==2.2.0 \
     --hash=sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92 \
     --hash=sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8 \
     # via flake8
-pygments==2.6.1 \
-    --hash=sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44 \
-    --hash=sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324 \
+pygments==2.7.1 \
+    --hash=sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998 \
+    --hash=sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7 \
     # via doc8
-regex==2020.7.14 \
-    --hash=sha256:0dc64ee3f33cd7899f79a8d788abfbec168410be356ed9bd30bbd3f0a23a7204 \
-    --hash=sha256:1269fef3167bb52631ad4fa7dd27bf635d5a0790b8e6222065d42e91bede4162 \
-    --hash=sha256:14a53646369157baa0499513f96091eb70382eb50b2c82393d17d7ec81b7b85f \
-    --hash=sha256:3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb \
-    --hash=sha256:46bac5ca10fb748d6c55843a931855e2727a7a22584f302dd9bb1506e69f83f6 \
-    --hash=sha256:4c037fd14c5f4e308b8370b447b469ca10e69427966527edcab07f52d88388f7 \
-    --hash=sha256:51178c738d559a2d1071ce0b0f56e57eb315bcf8f7d4cf127674b533e3101f88 \
-    --hash=sha256:5ea81ea3dbd6767873c611687141ec7b06ed8bab43f68fad5b7be184a920dc99 \
-    --hash=sha256:6961548bba529cac7c07af2fd4d527c5b91bb8fe18995fed6044ac22b3d14644 \
-    --hash=sha256:75aaa27aa521a182824d89e5ab0a1d16ca207318a6b65042b046053cfc8ed07a \
-    --hash=sha256:7a2dd66d2d4df34fa82c9dc85657c5e019b87932019947faece7983f2089a840 \
-    --hash=sha256:8a51f2c6d1f884e98846a0a9021ff6861bdb98457879f412fdc2b42d14494067 \
-    --hash=sha256:9c568495e35599625f7b999774e29e8d6b01a6fb684d77dee1f56d41b11b40cd \
-    --hash=sha256:9eddaafb3c48e0900690c1727fba226c4804b8e6127ea409689c3bb492d06de4 \
-    --hash=sha256:bbb332d45b32df41200380fff14712cb6093b61bd142272a10b16778c418e98e \
-    --hash=sha256:bc3d98f621898b4a9bc7fecc00513eec8f40b5b83913d74ccb445f037d58cd89 \
-    --hash=sha256:c11d6033115dc4887c456565303f540c44197f4fc1a2bfb192224a301534888e \
-    --hash=sha256:c50a724d136ec10d920661f1442e4a8b010a4fe5aebd65e0c2241ea41dbe93dc \
-    --hash=sha256:d0a5095d52b90ff38592bbdc2644f17c6d495762edf47d876049cfd2968fbccf \
-    --hash=sha256:d6cff2276e502b86a25fd10c2a96973fdb45c7a977dca2138d661417f3728341 \
-    --hash=sha256:e46d13f38cfcbb79bfdb2964b0fe12561fe633caf964a77a5f8d4e45fe5d2ef7 \
+regex==2020.9.27 \
+    --hash=sha256:088afc8c63e7bd187a3c70a94b9e50ab3f17e1d3f52a32750b5b77dbe99ef5ef \
+    --hash=sha256:1fe0a41437bbd06063aa184c34804efa886bcc128222e9916310c92cd54c3b4c \
+    --hash=sha256:41bb65f54bba392643557e617316d0d899ed5b4946dccee1cb6696152b29844b \
+    --hash=sha256:4318d56bccfe7d43e5addb272406ade7a2274da4b70eb15922a071c58ab0108c \
+    --hash=sha256:4707f3695b34335afdfb09be3802c87fa0bc27030471dbc082f815f23688bc63 \
+    --hash=sha256:5533a959a1748a5c042a6da71fe9267a908e21eded7a4f373efd23a2cbdb0ecc \
+    --hash=sha256:5f18875ac23d9aa2f060838e8b79093e8bb2313dbaaa9f54c6d8e52a5df097be \
+    --hash=sha256:60b0e9e6dc45683e569ec37c55ac20c582973841927a85f2d8a7d20ee80216ab \
+    --hash=sha256:84e9407db1b2eb368b7ecc283121b5e592c9aaedbe8c78b1a2f1102eb2e21d19 \
+    --hash=sha256:8d69cef61fa50c8133382e61fd97439de1ae623fe943578e477e76a9d9471637 \
+    --hash=sha256:9a02d0ae31d35e1ec12a4ea4d4cca990800f66a917d0fb997b20fbc13f5321fc \
+    --hash=sha256:9bc13e0d20b97ffb07821aa3e113f9998e84994fe4d159ffa3d3a9d1b805043b \
+    --hash=sha256:a6f32aea4260dfe0e55dc9733ea162ea38f0ea86aa7d0f77b15beac5bf7b369d \
+    --hash=sha256:ae91972f8ac958039920ef6e8769277c084971a142ce2b660691793ae44aae6b \
+    --hash=sha256:c570f6fa14b9c4c8a4924aaad354652366577b4f98213cf76305067144f7b100 \
+    --hash=sha256:d23a18037313714fb3bb5a94434d3151ee4300bae631894b1ac08111abeaa4a3 \
+    --hash=sha256:eaf548d117b6737df379fdd53bdde4f08870e66d7ea653e230477f071f861121 \
+    --hash=sha256:ebbe29186a3d9b0c591e71b7393f1ae08c83cb2d8e517d2a822b8f7ec99dfd8b \
+    --hash=sha256:eda4771e0ace7f67f58bc5b560e27fb20f32a148cbc993b0c3835970935c2707 \
+    --hash=sha256:f1b3afc574a3db3b25c89161059d857bd4909a1269b0b3cb3c904677c8c4a3f7 \
+    --hash=sha256:f2388013e68e750eaa16ccbea62d4130180c26abb1d8e5d584b9baf69672b30f \
     # via black
 restructuredtext-lint==1.3.1 \
     --hash=sha256:470e53b64817211a42805c3a104d2216f6f5834b22fe7adb637d1de4d6501fb8 \
@@ -115,9 +115,9 @@ six==1.15.0 \
     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
     --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \
     # via doc8
-stevedore==3.2.1 \
-    --hash=sha256:a34086819e2c7a7f86d5635363632829dab8014e5fd7be2454c7cba84ac7514e \
-    --hash=sha256:ddc09a744dc224c84ec8e8efcb70595042d21c97c76df60daee64c9ad53bc7ee \
+stevedore==3.2.2 \
+    --hash=sha256:5e1ab03eaae06ef6ce23859402de785f08d97780ed774948ef16c4652c41bc62 \
+    --hash=sha256:f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0 \
     # via doc8
 toml==0.10.1 \
     --hash=sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f \
diff --git a/requirements/main.in b/requirements/main.in
index 1e5c651f0b02..ff7c7324d0f3 100644
--- a/requirements/main.in
+++ b/requirements/main.in
@@ -4,7 +4,7 @@ argon2-cffi
 Babel
 bcrypt
 boto3
-celery[sqs]>=4
+celery[sqs]>=4,<5
 celery-redbeat
 certifi
 click
diff --git a/requirements/main.txt b/requirements/main.txt
index d05bcff332c8..cece19c2841b 100644
--- a/requirements/main.txt
+++ b/requirements/main.txt
@@ -4,8 +4,23 @@
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=requirements/main.txt requirements/main.in
 #
-alembic==1.4.2 \
-    --hash=sha256:035ab00497217628bf5d0be82d664d8713ab13d37b630084da8e1f98facf4dbf \
+aiohttp==3.6.2 \
+    --hash=sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e \
+    --hash=sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 \
+    --hash=sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a \
+    --hash=sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654 \
+    --hash=sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a \
+    --hash=sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4 \
+    --hash=sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17 \
+    --hash=sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec \
+    --hash=sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd \
+    --hash=sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48 \
+    --hash=sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59 \
+    --hash=sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965 \
+    # via google-auth
+alembic==1.4.3 \
+    --hash=sha256:4e02ed2aa796bd179965041afa092c55b51fb077de19d61835673cc80672c01c \
+    --hash=sha256:5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245 \
     # via -r requirements/main.in
 amqp==2.6.1 \
     --hash=sha256:70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21 \
@@ -29,10 +44,14 @@ argon2-cffi==20.1.0 \
     --hash=sha256:d8029b2d3e4b4cea770e9e5a0104dd8fa185c1724a0f01528ae4826a6d25f97d \
     --hash=sha256:da7f0445b71db6d3a72462e04f36544b0de871289b0bc8a7cc87c0f5ec7079fa \
     # via -r requirements/main.in
+async-timeout==3.0.1 \
+    --hash=sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f \
+    --hash=sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3 \
+    # via aiohttp
 attrs==20.2.0 \
     --hash=sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594 \
     --hash=sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc \
-    # via automat
+    # via aiohttp, automat
 automat==20.2.0 \
     --hash=sha256:7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33 \
     --hash=sha256:b6feb6455337df834f6c9962d6ccf771515b7d939bca142b29c20c2376bc6111 \
@@ -54,17 +73,17 @@ billiard==3.6.3.0 \
     --hash=sha256:bff575450859a6e0fbc2f9877d9b715b0bbc07c3565bb7ed2280526a0cdf5ede \
     --hash=sha256:d91725ce6425f33a97dfa72fb6bfef0e47d4652acd98a032bd1a7fbf06d5fa6a \
     # via celery
-bleach==3.1.5 \
-    --hash=sha256:2bce3d8fab545a6528c8fa5d9f9ae8ebc85a56da365c7f85180bfe96a35ef22f \
-    --hash=sha256:3c4c520fdb9db59ef139915a5db79f8b51bc2a7257ea0389f30c846883430a4b \
+bleach==3.2.1 \
+    --hash=sha256:52b5919b81842b1854196eaae5ca29679a2f2e378905c346d3ca8227c2c66080 \
+    --hash=sha256:9f8ccbeb6183c6e6cddea37592dfb0167485c1e3b13b3363bc325aa8bda3adbd \
     # via readme-renderer
-boto3==1.14.47 \
-    --hash=sha256:0d9cbeb5c8ca67650cc963c77e2e3b3ab5dffeeee16e03d61d740755f8fc7c44 \
-    --hash=sha256:df73edf3bd6f191870212e04ae9a8bc6245fd6749f464e9fb950392a8d15bd8c \
+boto3==1.15.7 \
+    --hash=sha256:1bfc96b7874ee9c477a9809c1706d0d4ab47c679264ea1f81b6ca4f78cb80830 \
+    --hash=sha256:5ed91fcf08e2d8f5cd1c8333ac767b3ab951b55a1634d168b2ca70da7d0f120b \
     # via -r requirements/main.in, celery
-botocore==1.17.47 \
-    --hash=sha256:42b320b449df22cdb1232913e4a066919d127feb8e58ad98898831e6255ccfe0 \
-    --hash=sha256:eca25f01c503c2b86b394497f875a0eb0d3fe367dbc032f3a02851ba7e827109 \
+botocore==1.18.7 \
+    --hash=sha256:22a0ab7ee20e4b0040ed618f6745472ff9d89d9c25ce23270bce0c0bdc676b51 \
+    --hash=sha256:2b3f676fbf054c54ebd40e3560bdc2800ac1a78381b6cf3c31957492b0275f6b \
     # via boto3, s3transfer
 cachetools==4.1.1 \
     --hash=sha256:513d4ff98dd27f85743a8dc0e92f55ddb1b49e060c2d5961512855cda2c01a98 \
@@ -84,40 +103,48 @@ certifi==2020.6.20 \
     --hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
     --hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41 \
     # via -r requirements/main.in, requests, sentry-sdk
-cffi==1.14.2 \
-    --hash=sha256:0da50dcbccd7cb7e6c741ab7912b2eff48e85af217d72b57f80ebc616257125e \
-    --hash=sha256:12a453e03124069b6896107ee133ae3ab04c624bb10683e1ed1c1663df17c13c \
-    --hash=sha256:15419020b0e812b40d96ec9d369b2bc8109cc3295eac6e013d3261343580cc7e \
-    --hash=sha256:15a5f59a4808f82d8ec7364cbace851df591c2d43bc76bcbe5c4543a7ddd1bf1 \
-    --hash=sha256:23e44937d7695c27c66a54d793dd4b45889a81b35c0751ba91040fe825ec59c4 \
-    --hash=sha256:29c4688ace466a365b85a51dcc5e3c853c1d283f293dfcc12f7a77e498f160d2 \
-    --hash=sha256:57214fa5430399dffd54f4be37b56fe22cedb2b98862550d43cc085fb698dc2c \
-    --hash=sha256:577791f948d34d569acb2d1add5831731c59d5a0c50a6d9f629ae1cefd9ca4a0 \
-    --hash=sha256:6539314d84c4d36f28d73adc1b45e9f4ee2a89cdc7e5d2b0a6dbacba31906798 \
-    --hash=sha256:65867d63f0fd1b500fa343d7798fa64e9e681b594e0a07dc934c13e76ee28fb1 \
-    --hash=sha256:672b539db20fef6b03d6f7a14b5825d57c98e4026401fce838849f8de73fe4d4 \
-    --hash=sha256:6843db0343e12e3f52cc58430ad559d850a53684f5b352540ca3f1bc56df0731 \
-    --hash=sha256:7057613efefd36cacabbdbcef010e0a9c20a88fc07eb3e616019ea1692fa5df4 \
-    --hash=sha256:76ada88d62eb24de7051c5157a1a78fd853cca9b91c0713c2e973e4196271d0c \
-    --hash=sha256:837398c2ec00228679513802e3744d1e8e3cb1204aa6ad408b6aff081e99a487 \
-    --hash=sha256:8662aabfeab00cea149a3d1c2999b0731e70c6b5bac596d95d13f643e76d3d4e \
-    --hash=sha256:95e9094162fa712f18b4f60896e34b621df99147c2cee216cfa8f022294e8e9f \
-    --hash=sha256:99cc66b33c418cd579c0f03b77b94263c305c389cb0c6972dac420f24b3bf123 \
-    --hash=sha256:9b219511d8b64d3fa14261963933be34028ea0e57455baf6781fe399c2c3206c \
-    --hash=sha256:ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b \
-    --hash=sha256:b9aa9d8818c2e917fa2c105ad538e222a5bce59777133840b93134022a7ce650 \
-    --hash=sha256:bf44a9a0141a082e89c90e8d785b212a872db793a0080c20f6ae6e2a0ebf82ad \
-    --hash=sha256:c0b48b98d79cf795b0916c57bebbc6d16bb43b9fc9b8c9f57f4cf05881904c75 \
-    --hash=sha256:da9d3c506f43e220336433dffe643fbfa40096d408cb9b7f2477892f369d5f82 \
-    --hash=sha256:e4082d832e36e7f9b2278bc774886ca8207346b99f278e54c9de4834f17232f7 \
-    --hash=sha256:e4b9b7af398c32e408c00eb4e0d33ced2f9121fd9fb978e6c1b57edd014a7d15 \
-    --hash=sha256:e613514a82539fc48291d01933951a13ae93b6b444a88782480be32245ed4afa \
-    --hash=sha256:f5033952def24172e60493b68717792e3aebb387a8d186c43c020d9363ee7281 \
+cffi==1.14.3 \
+    --hash=sha256:005f2bfe11b6745d726dbb07ace4d53f057de66e336ff92d61b8c7e9c8f4777d \
+    --hash=sha256:09e96138280241bd355cd585148dec04dbbedb4f46128f340d696eaafc82dd7b \
+    --hash=sha256:0b1ad452cc824665ddc682400b62c9e4f5b64736a2ba99110712fdee5f2505c4 \
+    --hash=sha256:0ef488305fdce2580c8b2708f22d7785ae222d9825d3094ab073e22e93dfe51f \
+    --hash=sha256:15f351bed09897fbda218e4db5a3d5c06328862f6198d4fb385f3e14e19decb3 \
+    --hash=sha256:22399ff4870fb4c7ef19fff6eeb20a8bbf15571913c181c78cb361024d574579 \
+    --hash=sha256:23e5d2040367322824605bc29ae8ee9175200b92cb5483ac7d466927a9b3d537 \
+    --hash=sha256:2791f68edc5749024b4722500e86303a10d342527e1e3bcac47f35fbd25b764e \
+    --hash=sha256:2f9674623ca39c9ebe38afa3da402e9326c245f0f5ceff0623dccdac15023e05 \
+    --hash=sha256:3363e77a6176afb8823b6e06db78c46dbc4c7813b00a41300a4873b6ba63b171 \
+    --hash=sha256:33c6cdc071ba5cd6d96769c8969a0531be2d08c2628a0143a10a7dcffa9719ca \
+    --hash=sha256:3b8eaf915ddc0709779889c472e553f0d3e8b7bdf62dab764c8921b09bf94522 \
+    --hash=sha256:3cb3e1b9ec43256c4e0f8d2837267a70b0e1ca8c4f456685508ae6106b1f504c \
+    --hash=sha256:3eeeb0405fd145e714f7633a5173318bd88d8bbfc3dd0a5751f8c4f70ae629bc \
+    --hash=sha256:44f60519595eaca110f248e5017363d751b12782a6f2bd6a7041cba275215f5d \
+    --hash=sha256:4d7c26bfc1ea9f92084a1d75e11999e97b62d63128bcc90c3624d07813c52808 \
+    --hash=sha256:529c4ed2e10437c205f38f3691a68be66c39197d01062618c55f74294a4a4828 \
+    --hash=sha256:6642f15ad963b5092d65aed022d033c77763515fdc07095208f15d3563003869 \
+    --hash=sha256:85ba797e1de5b48aa5a8427b6ba62cf69607c18c5d4eb747604b7302f1ec382d \
+    --hash=sha256:8f0f1e499e4000c4c347a124fa6a27d37608ced4fe9f7d45070563b7c4c370c9 \
+    --hash=sha256:a624fae282e81ad2e4871bdb767e2c914d0539708c0f078b5b355258293c98b0 \
+    --hash=sha256:b0358e6fefc74a16f745afa366acc89f979040e0cbc4eec55ab26ad1f6a9bfbc \
+    --hash=sha256:bbd2f4dfee1079f76943767fce837ade3087b578aeb9f69aec7857d5bf25db15 \
+    --hash=sha256:bf39a9e19ce7298f1bd6a9758fa99707e9e5b1ebe5e90f2c3913a47bc548747c \
+    --hash=sha256:c11579638288e53fc94ad60022ff1b67865363e730ee41ad5e6f0a17188b327a \
+    --hash=sha256:c150eaa3dadbb2b5339675b88d4573c1be3cb6f2c33a6c83387e10cc0bf05bd3 \
+    --hash=sha256:c53af463f4a40de78c58b8b2710ade243c81cbca641e34debf3396a9640d6ec1 \
+    --hash=sha256:cb763ceceae04803adcc4e2d80d611ef201c73da32d8f2722e9d0ab0c7f10768 \
+    --hash=sha256:cc75f58cdaf043fe6a7a6c04b3b5a0e694c6a9e24050967747251fb80d7bce0d \
+    --hash=sha256:d80998ed59176e8cba74028762fbd9b9153b9afc71ea118e63bbf5d4d0f9552b \
+    --hash=sha256:de31b5164d44ef4943db155b3e8e17929707cac1e5bd2f363e67a56e3af4af6e \
+    --hash=sha256:e66399cf0fc07de4dce4f588fc25bfe84a6d1285cc544e67987d22663393926d \
+    --hash=sha256:f0620511387790860b249b9241c2f13c3a80e21a73e0b861a2df24e9d6f56730 \
+    --hash=sha256:f4eae045e6ab2bb54ca279733fe4eb85f1effda392666308250714e01907f394 \
+    --hash=sha256:f92cdecb618e5fa4658aeb97d5eb3d2f47aa94ac6477c6daf0f306c5a3b9e6b1 \
+    --hash=sha256:f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591 \
     # via argon2-cffi, bcrypt, cmarkgfm, cryptography, google-crc32c, pynacl
 chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \
-    # via requests
+    # via aiohttp, requests
 click==7.1.2 \
     --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
     --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc \
@@ -152,29 +179,29 @@ cmarkgfm==0.4.2 \
     --hash=sha256:e8932bddf159064f04e946fbb64693753488de21586f20e840b3be51745c8c09 \
     --hash=sha256:f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c \
     # via readme-renderer
-cryptography==3.1 \
-    --hash=sha256:10c9775a3f31610cf6b694d1fe598f2183441de81cedcf1814451ae53d71b13a \
-    --hash=sha256:180c9f855a8ea280e72a5d61cf05681b230c2dce804c48e9b2983f491ecc44ed \
-    --hash=sha256:247df238bc05c7d2e934a761243bfdc67db03f339948b1e2e80c75d41fc7cc36 \
-    --hash=sha256:26409a473cc6278e4c90f782cd5968ebad04d3911ed1c402fc86908c17633e08 \
-    --hash=sha256:2a27615c965173c4c88f2961cf18115c08fedfb8bdc121347f26e8458dc6d237 \
-    --hash=sha256:2e26223ac636ca216e855748e7d435a1bf846809ed12ed898179587d0cf74618 \
-    --hash=sha256:321761d55fb7cb256b771ee4ed78e69486a7336be9143b90c52be59d7657f50f \
-    --hash=sha256:4005b38cd86fc51c955db40b0f0e52ff65340874495af72efabb1bb8ca881695 \
-    --hash=sha256:4b9e96543d0784acebb70991ebc2dbd99aa287f6217546bb993df22dd361d41c \
-    --hash=sha256:548b0818e88792318dc137d8b1ec82a0ab0af96c7f0603a00bb94f896fbf5e10 \
-    --hash=sha256:725875681afe50b41aee7fdd629cedbc4720bab350142b12c55c0a4d17c7416c \
-    --hash=sha256:7a63e97355f3cd77c94bd98c59cb85fe0efd76ea7ef904c9b0316b5bbfde6ed1 \
-    --hash=sha256:94191501e4b4009642be21dde2a78bd3c2701a81ee57d3d3d02f1d99f8b64a9e \
-    --hash=sha256:969ae512a250f869c1738ca63be843488ff5cc031987d302c1f59c7dbe1b225f \
-    --hash=sha256:9f734423eb9c2ea85000aa2476e0d7a58e021bc34f0a373ac52a5454cd52f791 \
-    --hash=sha256:b45ab1c6ece7c471f01c56f5d19818ca797c34541f0b2351635a5c9fe09ac2e0 \
-    --hash=sha256:cc6096c86ec0de26e2263c228fb25ee01c3ff1346d3cfc219d67d49f303585af \
-    --hash=sha256:dc3f437ca6353979aace181f1b790f0fc79e446235b14306241633ab7d61b8f8 \
-    --hash=sha256:e7563eb7bc5c7e75a213281715155248cceba88b11cb4b22957ad45b85903761 \
-    --hash=sha256:e7dad66a9e5684a40f270bd4aee1906878193ae50a4831922e454a2a457f1716 \
-    --hash=sha256:eb80a288e3cfc08f679f95da72d2ef90cb74f6d8a8ba69d2f215c5e110b2ca32 \
-    --hash=sha256:fa7fbcc40e2210aca26c7ac8a39467eae444d90a2c346cbcffd9133a166bcc67 \
+cryptography==3.1.1 \
+    --hash=sha256:21b47c59fcb1c36f1113f3709d37935368e34815ea1d7073862e92f810dc7499 \
+    --hash=sha256:451cdf60be4dafb6a3b78802006a020e6cd709c22d240f94f7a0696240a17154 \
+    --hash=sha256:4549b137d8cbe3c2eadfa56c0c858b78acbeff956bd461e40000b2164d9167c6 \
+    --hash=sha256:48ee615a779ffa749d7d50c291761dc921d93d7cf203dca2db663b4f193f0e49 \
+    --hash=sha256:559d622aef2a2dff98a892eef321433ba5bc55b2485220a8ca289c1ecc2bd54f \
+    --hash=sha256:5d52c72449bb02dd45a773a203196e6d4fae34e158769c896012401f33064396 \
+    --hash=sha256:65beb15e7f9c16e15934569d29fb4def74ea1469d8781f6b3507ab896d6d8719 \
+    --hash=sha256:680da076cad81cdf5ffcac50c477b6790be81768d30f9da9e01960c4b18a66db \
+    --hash=sha256:762bc5a0df03c51ee3f09c621e1cee64e3a079a2b5020de82f1613873d79ee70 \
+    --hash=sha256:89aceb31cd5f9fc2449fe8cf3810797ca52b65f1489002d58fe190bfb265c536 \
+    --hash=sha256:983c0c3de4cb9fcba68fd3f45ed846eb86a2a8b8d8bc5bb18364c4d00b3c61fe \
+    --hash=sha256:99d4984aabd4c7182050bca76176ce2dbc9fa9748afe583a7865c12954d714ba \
+    --hash=sha256:9d9fc6a16357965d282dd4ab6531013935425d0dc4950df2e0cf2a1b1ac1017d \
+    --hash=sha256:a7597ffc67987b37b12e09c029bd1dc43965f75d328076ae85721b84046e9ca7 \
+    --hash=sha256:ab010e461bb6b444eaf7f8c813bb716be2d78ab786103f9608ffd37a4bd7d490 \
+    --hash=sha256:b12e715c10a13ca1bd27fbceed9adc8c5ff640f8e1f7ea76416352de703523c8 \
+    --hash=sha256:b2bded09c578d19e08bd2c5bb8fed7f103e089752c9cf7ca7ca7de522326e921 \
+    --hash=sha256:b372026ebf32fe2523159f27d9f0e9f485092e43b00a5adacf732192a70ba118 \
+    --hash=sha256:cb179acdd4ae1e4a5a160d80b87841b3d0e0be84af46c7bb2cd7ece57a39c4ba \
+    --hash=sha256:e97a3b627e3cb63c415a16245d6cef2139cca18bb1183d1b9375a1c14e83f3b3 \
+    --hash=sha256:f0e099fc4cc697450c3dd4031791559692dd941a95254cb9aeded66a7aa8b9bc \
+    --hash=sha256:f99317a0fa2e49917689b8cf977510addcfaaab769b3f899b9c481bbd76730c2 \
     # via -r requirements/main.in, pyopenssl, webauthn
 cssselect==1.1.0 \
     --hash=sha256:f612ee47b749c877ebae5bb77035d8f4202c6ad0f0fc1271b3c18ad6c4468ecf \
@@ -204,7 +231,7 @@ docutils==0.15.2 \
     --hash=sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0 \
     --hash=sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827 \
     --hash=sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99 \
-    # via botocore, readme-renderer
+    # via readme-renderer
 elasticsearch-dsl==6.4.0 \
     --hash=sha256:26416f4dd46ceca43d62ef74970d9de4bdd6f4b0f163316f0b432c9e61a08bec \
     --hash=sha256:f60aea7fd756ac1fbe7ce114bbf4949aefbf495dfe8896640e787c67344f12f6 \
@@ -228,21 +255,21 @@ google-api-core==1.22.2 \
     --hash=sha256:67e33a852dcca7cb7eff49abc35c8cc2c0bb8ab11397dc8306d911505cae2990 \
     --hash=sha256:779107f17e0fef8169c5239d56a8fbff03f9f72a3893c0c9e5842ec29dfedd54 \
     # via google-cloud-bigquery, google-cloud-core
-google-auth==1.21.1 \
-    --hash=sha256:bcbd9f970e7144fe933908aa286d7a12c44b7deb6d78a76871f0377a29d09789 \
-    --hash=sha256:f4d5093f13b1b1c0a434ab1dc851cd26a983f86a4d75c95239974e33ed406a87 \
+google-auth==1.22.0 \
+    --hash=sha256:a73e6fb6d232ed1293ef9a5301e6f8aada7880d19c65d7f63e130dc50ec05593 \
+    --hash=sha256:e86e72142d939a8d90a772947268aacc127ab7a1d1d6f3e0fecca7a8d74d8257 \
     # via google-api-core, google-cloud-storage
-google-cloud-bigquery==1.27.2 \
-    --hash=sha256:171eb279a43df3e51cefd25542cbb9ab0d59d62949a29a7c33f0020560573a8d \
-    --hash=sha256:8a21cfe5db0c84aca0730197b50ea1649350619849283d0b5e7b506d803a6fa1 \
+google-cloud-bigquery==1.28.0 \
+    --hash=sha256:9266e989531f290d3b836dc7b308ac22b350c4d664af19325bd0102261231b71 \
+    --hash=sha256:9784cff71d6a46ce202748169f9c7e38fc99d6babbb2f3cdc540475d11f572b9 \
     # via -r requirements/main.in
 google-cloud-core==1.4.1 \
     --hash=sha256:4c9e457fcfc026fdde2e492228f04417d4c717fb0f29f070122fb0ab89e34ebd \
     --hash=sha256:613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507 \
     # via google-cloud-bigquery, google-cloud-storage
-google-cloud-storage==1.31.0 \
-    --hash=sha256:34fb8f7e8a2a633cbfb09d8dec38b3450c4029af1a328a67bca64f6226a1f4a5 \
-    --hash=sha256:4f51c7700242a9d54c07117f25fec5d110ab85435b3ce60ac28cc553f8ea938b \
+google-cloud-storage==1.31.2 \
+    --hash=sha256:74bbb5b2d0b249de4a52f561435d0c3570ddc19b249653ae588ec0abcc3c81e6 \
+    --hash=sha256:e2a2533b5e368365e84d2acaa53b75266a09802fc1c8bda52e3212335eccb6bd \
     # via -r requirements/main.in
 google-crc32c==1.0.0 \
     --hash=sha256:00b34d4c9ac565b2be553f81f58e5861e51d43af2043ed7cbfe1853ee2f54671 \
@@ -331,7 +358,7 @@ hupper==1.10.2 \
 idna==2.10 \
     --hash=sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6 \
     --hash=sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 \
-    # via email-validator, requests
+    # via email-validator, requests, yarl
 itsdangerous==1.1.0 \
     --hash=sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19 \
     --hash=sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749 \
@@ -357,6 +384,7 @@ lxml==4.5.2 \
     --hash=sha256:08fc93257dcfe9542c0a6883a25ba4971d78297f63d7a5a26ffa34861ca78730 \
     --hash=sha256:107781b213cf7201ec3806555657ccda67b1fccc4261fb889ef7fc56976db81f \
     --hash=sha256:121b665b04083a1e85ff1f5243d4a93aa1aaba281bc12ea334d5a187278ceaf1 \
+    --hash=sha256:1fa21263c3aba2b76fd7c45713d4428dbcc7644d73dcf0650e9d344e433741b3 \
     --hash=sha256:2b30aa2bcff8e958cd85d907d5109820b01ac511eae5b460803430a7404e34d7 \
     --hash=sha256:4b4a111bcf4b9c948e020fd207f915c24a6de3f1adc7682a2d92660eb4e84f1a \
     --hash=sha256:5591c4164755778e29e69b86e425880f852464a21c7bb53c7ea453bbe2633bbe \
@@ -367,6 +395,7 @@ lxml==4.5.2 \
     --hash=sha256:786aad2aa20de3dbff21aab86b2fb6a7be68064cbbc0219bde414d3a30aa47ae \
     --hash=sha256:7ad7906e098ccd30d8f7068030a0b16668ab8aa5cda6fcd5146d8d20cbaa71b5 \
     --hash=sha256:80a38b188d20c0524fe8959c8ce770a8fdf0e617c6912d23fc97c68301bb9aba \
+    --hash=sha256:8f0ec6b9b3832e0bd1d57af41f9238ea7709bbd7271f639024f2fc9d3bb01293 \
     --hash=sha256:92282c83547a9add85ad658143c76a64a8d339028926d7dc1998ca029c88ea6a \
     --hash=sha256:94150231f1e90c9595ccc80d7d2006c61f90a5995db82bccbca7944fd457f0f6 \
     --hash=sha256:9dc9006dcc47e00a8a6a029eb035c8f696ad38e40a27d073a003d7d1443f5d88 \
@@ -374,8 +403,10 @@ lxml==4.5.2 \
     --hash=sha256:aa8eba3db3d8761db161003e2d0586608092e217151d7458206e243be5a43843 \
     --hash=sha256:bea760a63ce9bba566c23f726d72b3c0250e2fa2569909e2d83cda1534c79443 \
     --hash=sha256:c3f511a3c58676147c277eff0224c061dd5a6a8e1373572ac817ac6324f1b1e0 \
+    --hash=sha256:c9d317efde4bafbc1561509bfa8a23c5cab66c44d49ab5b63ff690f5159b2304 \
     --hash=sha256:cc411ad324a4486b142c41d9b2b6a722c534096963688d879ea6fa8a35028258 \
     --hash=sha256:cdc13a1682b2a6241080745b1953719e7fe0850b40a5c71ca574f090a1391df6 \
+    --hash=sha256:cfd7c5dd3c35c19cec59c63df9571c67c6d6e5c92e0fe63517920e97f61106d1 \
     --hash=sha256:e1cacf4796b20865789083252186ce9dc6cc59eca0c2e79cca332bdff24ac481 \
     --hash=sha256:e70d4e467e243455492f5de463b72151cc400710ac03a0678206a5f27e79ddef \
     --hash=sha256:ecc930ae559ea8a43377e8b60ca6f8d61ac532fc57efb915d899de4a67928efd \
@@ -383,6 +414,7 @@ lxml==4.5.2 \
     # via -r requirements/main.in, premailer
 mako==1.1.3 \
     --hash=sha256:8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27 \
+    --hash=sha256:93729a258e4ff0747c876bd9e20df1b9758028946e976324ccd2d68245c7b6a9 \
     # via alembic
 markupsafe==1.1.1 \
     --hash=sha256:00bc623926325b26bb9605ae9eae8a215691f33cae5df11ca5424f06f2d1f473 \
@@ -443,6 +475,25 @@ msgpack==1.0.0 \
     --hash=sha256:e7bbdd8e2b277b77782f3ce34734b0dfde6cbe94ddb74de8d733d603c7f9e2b1 \
     --hash=sha256:ea41c9219c597f1d2bf6b374d951d310d58684b5de9dc4bd2976db9e1e22c140 \
     # via -r requirements/main.in
+multidict==4.7.6 \
+    --hash=sha256:1ece5a3369835c20ed57adadc663400b5525904e53bae59ec854a5d36b39b21a \
+    --hash=sha256:275ca32383bc5d1894b6975bb4ca6a7ff16ab76fa622967625baeebcf8079000 \
+    --hash=sha256:3750f2205b800aac4bb03b5ae48025a64e474d2c6cc79547988ba1d4122a09e2 \
+    --hash=sha256:4538273208e7294b2659b1602490f4ed3ab1c8cf9dbdd817e0e9db8e64be2507 \
+    --hash=sha256:5141c13374e6b25fe6bf092052ab55c0c03d21bd66c94a0e3ae371d3e4d865a5 \
+    --hash=sha256:51a4d210404ac61d32dada00a50ea7ba412e6ea945bbe992e4d7a595276d2ec7 \
+    --hash=sha256:5cf311a0f5ef80fe73e4f4c0f0998ec08f954a6ec72b746f3c179e37de1d210d \
+    --hash=sha256:6513728873f4326999429a8b00fc7ceddb2509b01d5fd3f3be7881a257b8d463 \
+    --hash=sha256:7388d2ef3c55a8ba80da62ecfafa06a1c097c18032a501ffd4cabbc52d7f2b19 \
+    --hash=sha256:9456e90649005ad40558f4cf51dbb842e32807df75146c6d940b6f5abb4a78f3 \
+    --hash=sha256:c026fe9a05130e44157b98fea3ab12969e5b60691a276150db9eda71710cd10b \
+    --hash=sha256:d14842362ed4cf63751648e7672f7174c9818459d169231d03c56e84daf90b7c \
+    --hash=sha256:e0d072ae0f2a179c375f67e3da300b47e1a83293c554450b29c900e50afaae87 \
+    --hash=sha256:f07acae137b71af3bb548bd8da720956a3bc9f9a0b87733e0899226a2317aeb7 \
+    --hash=sha256:fbb77a75e529021e7c4a8d4e823d88ef4d23674a202be4f5addffc72cbb91430 \
+    --hash=sha256:fcfbb44c59af3f8ea984de67ec7c306f618a3ec771c2843804069917a8f2e255 \
+    --hash=sha256:feed85993dbdb1dbc29102f50bca65bdc68f2c0c8d352468c25b54874f23c39d \
+    # via aiohttp, yarl
 packaging==20.4 \
     --hash=sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 \
     --hash=sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181 \
@@ -562,9 +613,9 @@ pycurl==7.43.0.5 \
     --hash=sha256:e1aea68b1d39dbcafc7298214f51f6ebd5f188c06aa418e9c046dfe419fe7ecf \
     --hash=sha256:ec7dd291545842295b7b56c12c90ffad2976cc7070c98d7b1517b7b6cd5994b3 \
     # via -r requirements/main.in, celery
-pygments==2.6.1 \
-    --hash=sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44 \
-    --hash=sha256:ff7a40b4860b727ab48fad6360eb351cc1b33cbf9b15a0f689ca5353e9463324 \
+pygments==2.7.1 \
+    --hash=sha256:307543fe65c0947b126e83dd5a61bd8acbd84abec11f43caebaf5534cbc17998 \
+    --hash=sha256:926c3f319eda178d1bd90851e4317e6d8cdb5e292a3386aac9bd75eca29cf9c7 \
     # via readme-renderer
 pymacaroons==0.13.0 \
     --hash=sha256:1e6bba42a5f66c245adf38a5a4006a99dcc06a0703786ea636098667d42903b8 \
@@ -575,19 +626,19 @@ pynacl==1.4.0 \
     --hash=sha256:11335f09060af52c97137d4ac54285bcb7df0cef29014a1a4efe64ac065434c4 \
     --hash=sha256:2fe0fc5a2480361dcaf4e6e7cea00e078fcda07ba45f811b167e3f99e8cff574 \
     --hash=sha256:30f9b96db44e09b3304f9ea95079b1b7316b2b4f3744fe3aaecccd95d547063d \
+    --hash=sha256:4e10569f8cbed81cb7526ae137049759d2a8d57726d52c1a000a3ce366779634 \
     --hash=sha256:511d269ee845037b95c9781aa702f90ccc36036f95d0f31373a6a79bd8242e25 \
     --hash=sha256:537a7ccbea22905a0ab36ea58577b39d1fa9b1884869d173b5cf111f006f689f \
     --hash=sha256:54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505 \
-    --hash=sha256:6ab15cebde37be8dc9471207e33aa7431dad57929b826b6bd243147527a4861b \
+    --hash=sha256:757250ddb3bff1eecd7e41e65f7f833a8405fede0194319f87899690624f2122 \
     --hash=sha256:7757ae33dae81c300487591c68790dfb5145c7d03324000433d9a2c141f82af7 \
     --hash=sha256:7c6092102219f59ff29788860ccb021e80fffd953920c4a8653889c029b2d420 \
     --hash=sha256:8122ba5f2a2169ca5da936b2e5a511740ffb73979381b4229d9188f6dcb22f1f \
-    --hash=sha256:95be540c5a3359019d999c91d6ff0b59c6c30f85a70b8860a885fdf1a3f92840 \
     --hash=sha256:9c4a7ea4fb81536c1b1f5cc44d54a296f96ae78c1ebd2311bd0b60be45a48d96 \
-    --hash=sha256:c878f2a3f9ccbce71167da0847797198138af35a7ae3f8673e80d7a6c5336d94 \
+    --hash=sha256:c914f78da4953b33d4685e3cdc7ce63401247a21425c16a39760e282075ac4a6 \
     --hash=sha256:cd401ccbc2a249a47a3a1724c2918fcd04be1f7b54eb2a5a71ff915db0ac51c6 \
     --hash=sha256:d452a6746f0a7e11121e64625109bc4468fc3100452817001dbe018bb8b08514 \
-    --hash=sha256:ec7aedc67d1505635761eab49feac38b8054461db6799e1b358dfd2c21efe22d \
+    --hash=sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff \
     --hash=sha256:f8851ab9041756003119368c1e6cd0b9c631f46d686b3904b18c0139f4419f80 \
     # via pymacaroons
 pyopenssl==19.1.0 \
@@ -661,14 +712,14 @@ repoze.sendmail==4.4.1 \
     --hash=sha256:7a8ea37914a5d38bad38052a83eac1d867b171ff4cc8b4d4994e892c05b0d424 \
     --hash=sha256:f1396893d3aa43502624e88941a441233c06679ae50b1966ffbfccba05da6347 \
     # via pyramid-mailer
-requests-aws4auth==1.0 \
-    --hash=sha256:2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce \
-    --hash=sha256:73f10dce17f11c93a90e06c8d3c7a28995c1f90a6dbe85a5637033669c3e097d \
+requests-aws4auth==1.0.1 \
+    --hash=sha256:6ddc92476c0ebab6c90709966e0ff3b2f16ba1f296b7ea8573645bbbe5ef9444 \
+    --hash=sha256:9a4a5f4a61c49f098f5f669410308ac5b0ea2682fd511ee3a4f9ff73b5bb275a \
     # via -r requirements/main.in
 requests==2.24.0 \
     --hash=sha256:b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b \
     --hash=sha256:fe75cc94a9443b9246fc7049224f75604b113c36acb93f87b80ed42c44cbb898 \
-    # via -r requirements/main.in, datadog, google-api-core, premailer, requests-aws4auth
+    # via -r requirements/main.in, datadog, google-api-core, google-cloud-storage, premailer, requests-aws4auth
 rfc3986==1.4.0 \
     --hash=sha256:112398da31a3344dc25dbf477d8df6cb34f9278a94fee2625d89e4514be8bb9d \
     --hash=sha256:af9147e9aceda37c91a05f4deb128d4b4b49d6b199775fd2d2927768abdc8f50 \
@@ -681,9 +732,9 @@ s3transfer==0.3.3 \
     --hash=sha256:2482b4259524933a022d59da830f51bd746db62f047d6eb213f2f8855dcb8a13 \
     --hash=sha256:921a37e2aefc64145e7b73d50c71bb4f26f46e4c9f414dc648c6245ff92cf7db \
     # via boto3
-sentry-sdk==0.17.4 \
-    --hash=sha256:97bff68e57402ad39674e6fe2545df0d5eea41c3d51e280c170761705c8c20ff \
-    --hash=sha256:a16caf9ce892623081cbb9a95f6c1f892778bb123909b0ed7afdfb52ce7a58a1 \
+sentry-sdk==0.17.8 \
+    --hash=sha256:c9c0fa1412bad87104c4eee8dd36c7bbf60b0d92ae917ab519094779b22e6d9a \
+    --hash=sha256:e159f7c919d19ae86e5a4ff370fccc45149fab461fbeb93fb5a735a0b33a9cb1 \
     # via -r requirements/main.in
 six==1.15.0 \
     --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \
@@ -696,10 +747,13 @@ sqlalchemy==1.3.19 \
     --hash=sha256:072766c3bd09294d716b2d114d46ffc5ccf8ea0b714a4e1c48253014b771c6bb \
     --hash=sha256:107d4af989831d7b091e382d192955679ec07a9209996bf8090f1f539ffc5804 \
     --hash=sha256:15c0bcd3c14f4086701c33a9e87e2c7ceb3bcb4a246cd88ec54a49cf2a5bd1a6 \
+    --hash=sha256:26c5ca9d09f0e21b8671a32f7d83caad5be1f6ff45eef5ec2f6fd0db85fc5dc0 \
     --hash=sha256:276936d41111a501cf4a1a0543e25449108d87e9f8c94714f7660eaea89ae5fe \
     --hash=sha256:3292a28344922415f939ee7f4fc0c186f3d5a0bf02192ceabd4f1129d71b08de \
     --hash=sha256:33d29ae8f1dc7c75b191bb6833f55a19c932514b9b5ce8c3ab9bc3047da5db36 \
     --hash=sha256:3bba2e9fbedb0511769780fe1d63007081008c5c2d7d715e91858c94dbaa260e \
+    --hash=sha256:465c999ef30b1c7525f81330184121521418a67189053bcf585824d833c05b66 \
+    --hash=sha256:51064ee7938526bab92acd049d41a1dc797422256086b39c08bafeffb9d304c6 \
     --hash=sha256:5a49e8473b1ab1228302ed27365ea0fadd4bf44bc0f9e73fe38e10fdd3d6b4fc \
     --hash=sha256:618db68745682f64cedc96ca93707805d1f3a031747b5a0d8e150cfd5055ae4d \
     --hash=sha256:6547b27698b5b3bbfc5210233bd9523de849b2bb8a0329cd754c9308fc8a05ce \
@@ -714,6 +768,7 @@ sqlalchemy==1.3.19 \
     --hash=sha256:9e865835e36dfbb1873b65e722ea627c096c11b05f796831e3a9b542926e979e \
     --hash=sha256:aa0554495fe06172b550098909be8db79b5accdf6ffb59611900bea345df5eba \
     --hash=sha256:b595e71c51657f9ee3235db8b53d0b57c09eee74dfb5b77edff0e46d2218dc02 \
+    --hash=sha256:b6ff91356354b7ff3bd208adcf875056d3d886ed7cef90c571aef2ab8a554b12 \
     --hash=sha256:b70bad2f1a5bd3460746c3fb3ab69e4e0eb5f59d977a23f9b66e5bdc74d97b86 \
     --hash=sha256:c7adb1f69a80573698c2def5ead584138ca00fff4ad9785a4b0b2bf927ba308d \
     --hash=sha256:c898b3ebcc9eae7b36bd0b4bbbafce2d8076680f6868bcbacee2d39a7a9726a7 \
@@ -742,9 +797,9 @@ translationstring==1.4 \
     --hash=sha256:5f4dc4d939573db851c8d840551e1a0fb27b946afe3b95aafc22577eed2d6262 \
     --hash=sha256:bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3 \
     # via pyramid
-trove-classifiers==2020.9.8 \
-    --hash=sha256:27ecd4f2b4ddb24f7f60a83bceedbdf3e4896c2c4d635ad172c9b1c803893193 \
-    --hash=sha256:ab9aaa0634bad12353bc1069bcde3273b47712897cdb0c22f1d4819ab7d65ca1 \
+trove-classifiers==2020.9.25 \
+    --hash=sha256:44c975c35ee2144da632e09931ea5aaf32277459809af17b711715eb789c2624 \
+    --hash=sha256:a95fc8d651bf85c8ac760e49ab26aa7ee5bf0359c20fff7adbef4ef7668937de \
     # via -r requirements/main.in
 typeguard==2.9.1 \
     --hash=sha256:529ef3d88189cc457f4340388028412f71be8091c2c943465146d4170fb67288 \
@@ -797,6 +852,25 @@ yara-python==4.0.2 \
     --hash=sha256:cd18d31cd044a7e383c63617f4a1c7047209b14312ab527a3741eaca79f3f88c \
     --hash=sha256:da37edad1e724cf586be0c78451cc3e3e3673b28676ed423e750f5cb793f22ee \
     # via -r requirements/main.in
+yarl==1.6.0 \
+    --hash=sha256:04a54f126a0732af75e5edc9addeaa2113e2ca7c6fce8974a63549a70a25e50e \
+    --hash=sha256:3cc860d72ed989f3b1f3abbd6ecf38e412de722fb38b8f1b1a086315cf0d69c5 \
+    --hash=sha256:5d84cc36981eb5a8533be79d6c43454c8e6a39ee3118ceaadbd3c029ab2ee580 \
+    --hash=sha256:5e447e7f3780f44f890360ea973418025e8c0cdcd7d6a1b221d952600fd945dc \
+    --hash=sha256:61d3ea3c175fe45f1498af868879c6ffeb989d4143ac542163c45538ba5ec21b \
+    --hash=sha256:67c5ea0970da882eaf9efcf65b66792557c526f8e55f752194eff8ec722c75c2 \
+    --hash=sha256:6f6898429ec3c4cfbef12907047136fd7b9e81a6ee9f105b45505e633427330a \
+    --hash=sha256:7ce35944e8e61927a8f4eb78f5bc5d1e6da6d40eadd77e3f79d4e9399e263921 \
+    --hash=sha256:b7c199d2cbaf892ba0f91ed36d12ff41ecd0dde46cbf64ff4bfe997a3ebc925e \
+    --hash=sha256:c15d71a640fb1f8e98a1423f9c64d7f1f6a3a168f803042eaf3a5b5022fde0c1 \
+    --hash=sha256:c22607421f49c0cb6ff3ed593a49b6a99c6ffdeaaa6c944cdda83c2393c8864d \
+    --hash=sha256:c604998ab8115db802cc55cb1b91619b2831a6128a62ca7eea577fc8ea4d3131 \
+    --hash=sha256:d088ea9319e49273f25b1c96a3763bf19a882cff774d1792ae6fba34bd40550a \
+    --hash=sha256:db9eb8307219d7e09b33bcb43287222ef35cbcf1586ba9472b0a4b833666ada1 \
+    --hash=sha256:e31fef4e7b68184545c3d68baec7074532e077bd1906b040ecfba659737df188 \
+    --hash=sha256:e32f0fb443afcfe7f01f95172b66f279938fbc6bdaebe294b0ff6747fb6db020 \
+    --hash=sha256:fcbe419805c9b20db9a51d33b942feddbf6e7fb468cb20686fd7089d4164c12a \
+    # via aiohttp
 zope.deprecation==4.4.0 \
     --hash=sha256:0d453338f04bacf91bbfba545d8bcdf529aa829e67b705eac8c1a7fdce66e2df \
     --hash=sha256:f1480b74995958b24ce37b0ef04d3663d2683e5d6debc96726eff18acf4ea113 \
diff --git a/requirements/tests.txt b/requirements/tests.txt
index a8af2ae5de2a..ca5fb2e3a7b5 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -8,10 +8,10 @@ attrs==20.2.0 \
     --hash=sha256:26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594 \
     --hash=sha256:fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc \
     # via pytest
-beautifulsoup4==4.9.1 \
-    --hash=sha256:73cc4d115b96f79c7d77c1c7f7a0a8d4c57860d1041df407dd1aae7f07a77fd7 \
-    --hash=sha256:a6237df3c32ccfaee4fd201c8f5f9d9df619b93121d01353a64a73ce8c6ef9a8 \
-    --hash=sha256:e718f2342e2e099b640a34ab782407b7b676f47ee272d6739e60b8ea23829f2c \
+beautifulsoup4==4.9.2 \
+    --hash=sha256:1edf5e39f3a5bc6e38b235b369128416c7239b34f692acccececb040233032a1 \
+    --hash=sha256:5dfe44f8fddc89ac5453f02659d3ab1668f2c0d9684839f0785037e8c6d9ac8d \
+    --hash=sha256:645d833a828722357038299b7f6879940c11dddd95b900fe5387c258b72bb883 \
     # via webtest
 bok-choy==1.1.1 \
     --hash=sha256:67e8a868d645d68cfc0d1d14fe2bf522f1508655242333a1161d748af1d02650 \
@@ -25,48 +25,48 @@ chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \
     # via requests
-coverage==5.2.1 \
-    --hash=sha256:098a703d913be6fbd146a8c50cc76513d726b022d170e5e98dc56d958fd592fb \
-    --hash=sha256:16042dc7f8e632e0dcd5206a5095ebd18cb1d005f4c89694f7f8aafd96dd43a3 \
-    --hash=sha256:1adb6be0dcef0cf9434619d3b892772fdb48e793300f9d762e480e043bd8e716 \
-    --hash=sha256:27ca5a2bc04d68f0776f2cdcb8bbd508bbe430a7bf9c02315cd05fb1d86d0034 \
-    --hash=sha256:28f42dc5172ebdc32622a2c3f7ead1b836cdbf253569ae5673f499e35db0bac3 \
-    --hash=sha256:2fcc8b58953d74d199a1a4d633df8146f0ac36c4e720b4a1997e9b6327af43a8 \
-    --hash=sha256:304fbe451698373dc6653772c72c5d5e883a4aadaf20343592a7abb2e643dae0 \
-    --hash=sha256:30bc103587e0d3df9e52cd9da1dd915265a22fad0b72afe54daf840c984b564f \
-    --hash=sha256:40f70f81be4d34f8d491e55936904db5c527b0711b2a46513641a5729783c2e4 \
-    --hash=sha256:4186fc95c9febeab5681bc3248553d5ec8c2999b8424d4fc3a39c9cba5796962 \
-    --hash=sha256:46794c815e56f1431c66d81943fa90721bb858375fb36e5903697d5eef88627d \
-    --hash=sha256:4869ab1c1ed33953bb2433ce7b894a28d724b7aa76c19b11e2878034a4e4680b \
-    --hash=sha256:4f6428b55d2916a69f8d6453e48a505c07b2245653b0aa9f0dee38785939f5e4 \
-    --hash=sha256:52f185ffd3291196dc1aae506b42e178a592b0b60a8610b108e6ad892cfc1bb3 \
-    --hash=sha256:538f2fd5eb64366f37c97fdb3077d665fa946d2b6d95447622292f38407f9258 \
-    --hash=sha256:64c4f340338c68c463f1b56e3f2f0423f7b17ba6c3febae80b81f0e093077f59 \
-    --hash=sha256:675192fca634f0df69af3493a48224f211f8db4e84452b08d5fcebb9167adb01 \
-    --hash=sha256:700997b77cfab016533b3e7dbc03b71d33ee4df1d79f2463a318ca0263fc29dd \
-    --hash=sha256:8505e614c983834239f865da2dd336dcf9d72776b951d5dfa5ac36b987726e1b \
-    --hash=sha256:962c44070c281d86398aeb8f64e1bf37816a4dfc6f4c0f114756b14fc575621d \
-    --hash=sha256:9e536783a5acee79a9b308be97d3952b662748c4037b6a24cbb339dc7ed8eb89 \
-    --hash=sha256:9ea749fd447ce7fb1ac71f7616371f04054d969d412d37611716721931e36efd \
-    --hash=sha256:a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b \
-    --hash=sha256:a3ee9c793ffefe2944d3a2bd928a0e436cd0ac2d9e3723152d6fd5398838ce7d \
-    --hash=sha256:aab75d99f3f2874733946a7648ce87a50019eb90baef931698f96b76b6769a46 \
-    --hash=sha256:b1ed2bdb27b4c9fc87058a1cb751c4df8752002143ed393899edb82b131e0546 \
-    --hash=sha256:b360d8fd88d2bad01cb953d81fd2edd4be539df7bfec41e8753fe9f4456a5082 \
-    --hash=sha256:b8f58c7db64d8f27078cbf2a4391af6aa4e4767cc08b37555c4ae064b8558d9b \
-    --hash=sha256:c1bbb628ed5192124889b51204de27c575b3ffc05a5a91307e7640eff1d48da4 \
-    --hash=sha256:c2ff24df02a125b7b346c4c9078c8936da06964cc2d276292c357d64378158f8 \
-    --hash=sha256:c890728a93fffd0407d7d37c1e6083ff3f9f211c83b4316fae3778417eab9811 \
-    --hash=sha256:c96472b8ca5dc135fb0aa62f79b033f02aa434fb03a8b190600a5ae4102df1fd \
-    --hash=sha256:ce7866f29d3025b5b34c2e944e66ebef0d92e4a4f2463f7266daa03a1332a651 \
-    --hash=sha256:e26c993bd4b220429d4ec8c1468eca445a4064a61c74ca08da7429af9bc53bb0 \
+coverage==5.3 \
+    --hash=sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516 \
+    --hash=sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259 \
+    --hash=sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9 \
+    --hash=sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097 \
+    --hash=sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0 \
+    --hash=sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f \
+    --hash=sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7 \
+    --hash=sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c \
+    --hash=sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5 \
+    --hash=sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7 \
+    --hash=sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729 \
+    --hash=sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978 \
+    --hash=sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9 \
+    --hash=sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f \
+    --hash=sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9 \
+    --hash=sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822 \
+    --hash=sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418 \
+    --hash=sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82 \
+    --hash=sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f \
+    --hash=sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d \
+    --hash=sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221 \
+    --hash=sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4 \
+    --hash=sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21 \
+    --hash=sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709 \
+    --hash=sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54 \
+    --hash=sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d \
+    --hash=sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270 \
+    --hash=sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24 \
+    --hash=sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751 \
+    --hash=sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a \
+    --hash=sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237 \
+    --hash=sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7 \
+    --hash=sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636 \
+    --hash=sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8 \
     # via -r requirements/tests.in
 factory-boy==3.0.1 \
     --hash=sha256:2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e \
     # via -r requirements/tests.in
-faker==4.1.2 \
-    --hash=sha256:bc4b8c908dfcd84e4fe5d9fa2e52fbe17546515fb8f126909b98c47badf05658 \
-    --hash=sha256:ff188c416864e3f7d8becd8f9ee683a4b4101a2a2d2bcdcb3e84bb1bdd06eaae \
+faker==4.1.3 \
+    --hash=sha256:075a95ac4c95765370919d787dcd958acfaea635005ad5af4d926cb0973800db \
+    --hash=sha256:80bab8d46035a7393de827210c5d39c17109d3346d131946bde622137120c496 \
     # via factory-boy
 fakeredis==1.4.3 \
     --hash=sha256:7ea0866ba5edb40fe2e9b1722535df0c7e6b91d518aa5f50d96c2fff3ea7f4c2 \
@@ -92,10 +92,6 @@ mirakuru==2.3.0 \
     --hash=sha256:1f89b9e5f23cec4181aa0225622b1996786848d830f51a12aa9c863bbfc2acc6 \
     --hash=sha256:cb90f587ebd2ca5b8c9c61ce025be86ec123522a8b100b2a419bc7e8d28259f0 \
     # via pytest-postgresql
-more-itertools==8.5.0 \
-    --hash=sha256:6f83822ae94818eae2612063a5101a7311e68ae8002005b5e05f03fd74a86a20 \
-    --hash=sha256:9b30f12df9393f0d28af9210ff8efe48d10c94f73e5daf886f10c4b0b0b4f03c \
-    # via pytest
 packaging==20.4 \
     --hash=sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 \
     --hash=sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181 \
@@ -133,12 +129,12 @@ pyparsing==2.4.7 \
     --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \
     --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b \
     # via packaging
-pytest-postgresql==2.4.1 \
-    --hash=sha256:8aba9b899f503a12e716a19f1e8afaeafa0fe5041f31055b00d64a5c50ab3af1 \
+pytest-postgresql==2.5.0 \
+    --hash=sha256:1660fdb5167f93618fa7a7c45959d3b369dd6e31f2661e79db80273e30332f68 \
     # via -r requirements/tests.in
-pytest==6.0.1 \
-    --hash=sha256:85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4 \
-    --hash=sha256:8b6007800c53fdacd5a5c192203f4e531eb2a1540ad9c752e052ec0f7143dbad \
+pytest==6.1.0 \
+    --hash=sha256:1cd09785c0a50f9af72220dd12aa78cfa49cbffc356c61eab009ca189e018a33 \
+    --hash=sha256:d010e24666435b39a4cf48740b039885642b6c273a3f77be3e7e03554d2806b7 \
     # via -r requirements/tests.in, pytest-postgresql
 python-dateutil==2.8.1 \
     --hash=sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c \

From 8d0c9d9bbab0f588cad5cb98d2a0ec28ff5605ed Mon Sep 17 00:00:00 2001
From: Sviatoslav Sydorenko <wk@sydorenko.org.ua>
Date: Wed, 30 Sep 2020 11:25:05 +0200
Subject: [PATCH 5/5] Fix a typo (s/an/a/) in the malware issue template
 (#8633)

---
 .github/ISSUE_TEMPLATE/malware-check.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/malware-check.md b/.github/ISSUE_TEMPLATE/malware-check.md
index 618015ec083d..ac8f09e1f50c 100644
--- a/.github/ISSUE_TEMPLATE/malware-check.md
+++ b/.github/ISSUE_TEMPLATE/malware-check.md
@@ -1,6 +1,6 @@
 ---
 name: Malware Check
-about: Contribute an new automated malware check to PyPI
+about: Contribute a new automated malware check to PyPI
 
 ---