summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-23 10:11:34 +0100
committerGitHub <noreply@github.com>2019-07-23 10:11:34 +0100
commit39e594b7652e6c14c2c6cf7f6a0429572c402d09 (patch)
tree1e6ea7bad367d08e8ee12139bd82d08281807e4e
parentFix logging in workers (#5729) (diff)
parentNewsfile (diff)
downloadsynapse-39e594b7652e6c14c2c6cf7f6a0429572c402d09.tar.xz
Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklist
Don't package sytest-blacklist file.
-rw-r--r--MANIFEST.in2
-rw-r--r--changelog.d/5733.misc1
2 files changed, 2 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index 834ddfad39..919cd8a1cd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,6 @@ include demo/README
 include demo/demo.tls.dh
 include demo/*.py
 include demo/*.sh
-include sytest-blacklist
 
 recursive-include synapse/storage/schema *.sql
 recursive-include synapse/storage/schema *.sql.postgres
@@ -34,6 +33,7 @@ exclude Dockerfile
 exclude .dockerignore
 exclude test_postgresql.sh
 exclude .editorconfig
+exclude sytest-blacklist
 
 include pyproject.toml
 recursive-include changelog.d *
diff --git a/changelog.d/5733.misc b/changelog.d/5733.misc
new file mode 100644
index 0000000000..a2a8c26383
--- /dev/null
+++ b/changelog.d/5733.misc
@@ -0,0 +1 @@
+Don't package the sytest test blacklist file.