summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-05-04 13:15:39 +0200
committerBrendan Abolivier <babolivier@matrix.org>2020-05-04 15:18:06 +0200
commit068da604c2142e173817dc508dc510bee7ab6b64 (patch)
tree9ffbe17b219563a347e48fa009eafe6ebae00688
parentUse `stream.current_token()` and remove `stream_positions()` (#7172) (diff)
downloadsynapse-068da604c2142e173817dc508dc510bee7ab6b64.tar.xz
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
-rw-r--r--MANIFEST.in7
-rw-r--r--changelog.d/7404.misc1
2 files changed, 5 insertions, 3 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 156d6f04f7..9bdfd82f4f 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 0000000000..9ac17958cc
--- /dev/null
+++ b/changelog.d/7404.misc
@@ -0,0 +1 @@
+Fix issues with the Python package manifest.