From dd699b63b09f886db11dac12e9d8cbaa49f555cb Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Mon, 21 Feb 2022 18:45:17 +0000
Subject: [PATCH 1/2] Nuke the tox `packaging` job

It only checks the manifest. Once #11537 lands there won't be a manifest
any more.
---
 .github/workflows/tests.yml |  1 -
 tox.ini                     | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2afddf58d1cd..5d20bd65d2db 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -27,7 +27,6 @@ jobs:
           - "check_codestyle"
           - "check_isort"
           - "mypy"
-          - "packaging"
 
     steps:
       - uses: actions/checkout@v2
diff --git a/tox.ini b/tox.ini
index 3ffd2c3e97e8..69476b5869aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = packaging, py37, py38, py39, py310, check_codestyle, check_isort
+envlist = py37, py38, py39, py310, check_codestyle, check_isort
 
 # we require tox>=2.3.2 for the fix to https://github.com/tox-dev/tox/issues/208
 minversion = 2.3.2
@@ -138,14 +138,6 @@ setenv =
 commands =
     python -m synmark {posargs:}
 
-[testenv:packaging]
-skip_install = true
-usedevelop = false
-deps =
-    check-manifest
-commands =
-    check-manifest
-
 [testenv:check_codestyle]
 extras = lint
 commands =

From 2ed163f0b82993339783a91a0eb3e101e33585a3 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Wed, 30 Mar 2022 17:36:23 +0100
Subject: [PATCH 2/2] Changelog

---
 changelog.d/12334.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/12334.misc

diff --git a/changelog.d/12334.misc b/changelog.d/12334.misc
new file mode 100644
index 000000000000..10a57e23b3af
--- /dev/null
+++ b/changelog.d/12334.misc
@@ -0,0 +1 @@
+Remove the `tox` packaging job: it will be redundant once #11537 lands.