From 068da604c2142e173817dc508dc510bee7ab6b64 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Mon, 4 May 2020 13:15:39 +0200
Subject: [PATCH] Fix MANIFEST.in

An update of check-manifest shone some light on some issues with MANIFEST.in, specifically that we didn't ignore/prune the contrib directory, and that we were using prune instead of exclude for files. This fixes both issues.

Fixes #7403
---
 MANIFEST.in           | 7 ++++---
 changelog.d/7404.misc | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/7404.misc

diff --git a/MANIFEST.in b/MANIFEST.in
index 156d6f04f7b1..9bdfd82f4fb3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -35,18 +35,19 @@ exclude .dockerignore
 exclude test_postgresql.sh
 exclude .editorconfig
 exclude sytest-blacklist
+exclude mypy.ini
+exclude .codecov.yml
+exclude .coveragerc
 
 include pyproject.toml
 recursive-include changelog.d *
 
 prune .buildkite
 prune .circleci
-prune .codecov.yml
-prune .coveragerc
 prune .github
 prune debian
 prune demo/etc
 prune docker
-prune mypy.ini
 prune snap
 prune stubs
+prune contrib
diff --git a/changelog.d/7404.misc b/changelog.d/7404.misc
new file mode 100644
index 000000000000..9ac17958cc8e
--- /dev/null
+++ b/changelog.d/7404.misc
@@ -0,0 +1 @@
+Fix issues with the Python package manifest.