summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-21 00:00:06 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-21 00:00:06 +0000
commitc398dd774a6ad32d4d23881da7cf084b63476dcb (patch)
tree64f2c64addc7fe64122aecbe3f54929dccf87ec1
parent408c38a60f78c54ebaf2b6651cc3898d471cab15 (diff)
parenta9f9254934c603a32775498e9fc12a0495dff4eb (diff)
downloadbuildstream-c398dd774a6ad32d4d23881da7cf084b63476dcb.tar.gz
Merge branch 'chandan/remove-manifest-conftest' into 'master'
MANIFEST.in: Remove conftest.py include See merge request BuildStream/buildstream!1249
-rw-r--r--MANIFEST.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index d23bb79cc..a8899a91e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -23,7 +23,6 @@ recursive-include doc/sessions *.run
# Tests
recursive-include tests *
-include conftest.py
include tox.ini
include .coveragerc
include .pylintrc