From d921e5de11b1bbe7e4cf9ed5ff531e8269b43057 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Mon, 21 Feb 2022 18:45:17 +0000
Subject: [PATCH] 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 -
 synapse/__init__.py         |  7 ++-----
 tox.ini                     | 10 +---------
 3 files changed, 3 insertions(+), 15 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/synapse/__init__.py b/synapse/__init__.py
index 88aef1889c83..9d0707fdd2a4 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -70,9 +70,6 @@
 
 __version__ = "1.55.2"
 
-if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
-    # We import here so that we don't have to install a bunch of deps when
-    # running the packaging tox test.
-    from synapse.util.patch_inline_callbacks import do_patch
+from synapse.util.patch_inline_callbacks import do_patch
 
-    do_patch()
+do_patch()
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 =